48ac61d75fc2f955608d709aa6fedccbb5ad68e8 Matthew Windwer matt@reframeit.com http://github.com/reframeit/merb-core/commit/efc87c2a614127fad56b45be3d1ea814d71bf4e6 efc87c2a614127fad56b45be3d1ea814d71bf4e6

2008-07-30T11:54:29-07:00

better error message for unrouted test request c80c6f0f31314feb4be6cb3013f9775a474a5892 Matthew Windwer matt@reframeit.com 72b3a21e9dd564380b426d7719d0852ca2a4101b Matthew Windwer matt@reframeit.com http://github.com/reframeit/merb-core/commit/48ac61d75fc2f955608d709aa6fedccbb5ad68e8 48ac61d75fc2f955608d709aa6fedccbb5ad68e8

2008-07-30T11:49:57-07:00

allow wildcard routing example: r.match(%r{/foo/:path*}).to(:controller => 'foo') then '/foo/bar/silly.json' will route to Foo#index with params[:path] = 'bar/silly.json' 95d1ed5b70a1f8ea4a68ebe936b5b5fb6b6f7659 Matthew Windwer matt@reframeit.com 2206d1a5cce8114c80403912a5f3b77897ae96a0 Matthew Windwer matt@reframeit.com http://github.com/reframeit/merb-core/commit/72b3a21e9dd564380b426d7719d0852ca2a4101b 72b3a21e9dd564380b426d7719d0852ca2a4101b

2008-07-30T11:45:28-07:00

allow filter arguments to be procs ff663a9a9e278d6624b577407fe9dc4bb8523b22 Matthew Windwer matt@reframeit.com 4813273a78309d0578c4b9d208acf9b221899b01 Matthew Windwer matt@reframeit.com http://github.com/reframeit/merb-core/commit/2206d1a5cce8114c80403912a5f3b77897ae96a0 2206d1a5cce8114c80403912a5f3b77897ae96a0

2008-07-30T11:42:02-07:00

honor cookie domain when setting and deleting cookies 99b2f3f55b2e4d601348df8a98812ac19bf49afe Matthew Windwer matt@reframeit.com ad78ee6115de080b571259d606bb24d43d4aab70 1dacf4c354a2e16c5902f7d300902d4f3a3687af Matthew Windwer matt@reframeit.com http://github.com/reframeit/merb-core/commit/4813273a78309d0578c4b9d208acf9b221899b01 4813273a78309d0578c4b9d208acf9b221899b01

2008-07-30T11:38:40-07:00

Merge branch 'master' of git://github.com/wycats/merb-core into wycats/master e8bfcc33c80c3bdb9f6324619d9a7dcaf171b5bc Matthew Windwer matt@reframeit.com de3e51ff45312166439a3a2038fba8cb2aa37892 Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/1dacf4c354a2e16c5902f7d300902d4f3a3687af 1dacf4c354a2e16c5902f7d300902d4f3a3687af

2008-07-27T17:00:56-07:00

Added more documentation for some of the extra options available to #partial 360d6eb8cb7fd82555b3f0af8057d890a3abfb60 Carl Lerche carllerche@mac.com ffb418a2ce5fd38c064260a8e19fe68d6ea96e4f 8e4f82b0dfd45515df63c49e1da77938b361a720 Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/de3e51ff45312166439a3a2038fba8cb2aa37892 de3e51ff45312166439a3a2038fba8cb2aa37892

2008-07-27T16:51:41-07:00

Merge branch 'master' of git://github.com/wycats/merb-core 156ec9287b261df73b68913e1683c5df4d2a9609 Carl Lerche carllerche@mac.com 1c831524de80dec7a52cf6a7fd9631685402c8b7 Fabien Franzen info@atelierfabien.be http://github.com/reframeit/merb-core/commit/8e4f82b0dfd45515df63c49e1da77938b361a720 8e4f82b0dfd45515df63c49e1da77938b361a720

2008-07-25T07:00:17-07:00

Relative :template paths can be extensionless again. 2857329b0e99e9451a7031931218c6b341ca464c Fabien Franzen info@atelierfabien.be 105a206920f0fb4bea379e968770527fcac6876b Fabien Franzen info@atelierfabien.be http://github.com/reframeit/merb-core/commit/1c831524de80dec7a52cf6a7fd9631685402c8b7 1c831524de80dec7a52cf6a7fd9631685402c8b7

2008-07-25T03:55:10-07:00

Oops - forgot some files... 53f0b3a24c727d32e12cfb72e57f9a6678a05ddc Fabien Franzen info@atelierfabien.be df7306d346d9ee721f15e3adb0367f0c188f2e66 Fabien Franzen info@atelierfabien.be http://github.com/reframeit/merb-core/commit/105a206920f0fb4bea379e968770527fcac6876b 105a206920f0fb4bea379e968770527fcac6876b

2008-07-25T03:43:34-07:00

Fixed nasty bugs in controller/mixins/responder and its specs. 7093017540aed63e8af13486e17667f66c5b20bc Fabien Franzen info@atelierfabien.be 36efa1253db212f4d432f8aa65606c57913161e3 Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/ffb418a2ce5fd38c064260a8e19fe68d6ea96e4f ffb418a2ce5fd38c064260a8e19fe68d6ea96e4f

2008-07-24T23:39:48-07:00

Reworded the documentation for #partial a little bit a51794d647e36f85c912f13cd2a58f53e010d837 Carl Lerche carllerche@mac.com df7306d346d9ee721f15e3adb0367f0c188f2e66 Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/36efa1253db212f4d432f8aa65606c57913161e3 36efa1253db212f4d432f8aa65606c57913161e3

2008-07-24T23:22:57-07:00

Added some documentation for the new partial collection counter 5941cda4b2a069d8b741f6374a80c7c47d6ca40d Carl Lerche carllerche@mac.com 088f956443e93d50d1b740e71b9454099efec73f Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/df7306d346d9ee721f15e3adb0367f0c188f2e66 df7306d346d9ee721f15e3adb0367f0c188f2e66

2008-07-24T22:35:01-07:00

Slight refactoring of the partial method 9c110235bd78b5b6c39a4336c6cc9d0cd036ce36 Carl Lerche carllerche@mac.com fea472686b12a0f5da9c2eb1dfab4266836d2fbf Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/088f956443e93d50d1b740e71b9454099efec73f 088f956443e93d50d1b740e71b9454099efec73f

2008-07-24T22:30:25-07:00

Adding views for the new partial collection counter specs 55a56e74529705e373c76fbd075053c32cf26185 Carl Lerche carllerche@mac.com 7cb2d479de25ea46661584b0b636810b0def0f01 Carl Lerche carllerche@mac.com http://github.com/reframeit/merb-core/commit/fea472686b12a0f5da9c2eb1dfab4266836d2fbf fea472686b12a0f5da9c2eb1dfab4266836d2fbf

2008-07-24T22:29:40-07:00

Adding the current index and collection size for partials rendered with a collection 4c7149fdc95d03de5f5d2945854329f5a39b3b06 Carl Lerche carllerche@mac.com 901ec3fa2617ffe39f70347ac749a1a64f261903 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/7cb2d479de25ea46661584b0b636810b0def0f01 7cb2d479de25ea46661584b0b636810b0def0f01

2008-07-23T17:26:39-07:00

If someone can figure out why this is already defined, please let me know 496e3a357f4241ac94faf3c561603fb47de1a168 Yehuda Katz wycats@gmail.com bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/901ec3fa2617ffe39f70347ac749a1a64f261903 901ec3fa2617ffe39f70347ac749a1a64f261903

2008-07-23T17:12:21-07:00

Yeah... not a good idea 2bcb8203752cc4f1f5b8ccdd7eb406104e25e837 Yehuda Katz wycats@gmail.com dea5b6914daa668e01ded198281441796925a3d5 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2 bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2

2008-07-23T17:07:47-07:00

ADd push_paths to the load path. be888cd5be397fce02efafb8176414a1da3e273b Yehuda Katz wycats@gmail.com 04d38da798cda4217dcd3b1b29c9043e873b6ad0 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/dea5b6914daa668e01ded198281441796925a3d5 dea5b6914daa668e01ded198281441796925a3d5

2008-07-23T16:30:23-07:00

another tiny tweak 4e7fc991608e3c910f79b960b97bc69d07b11e0a Yehuda Katz wycats@gmail.com a869557e886ed1aa35e9bd54882a7e03684629a9 0a3d655be79657b99549a5522a13847119c95f4c Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/04d38da798cda4217dcd3b1b29c9043e873b6ad0 04d38da798cda4217dcd3b1b29c9043e873b6ad0

2008-07-23T15:37:58-07:00

Merge branch 'master' of git@github.com:wycats/merb-core 02a46e1ac765cad8bb8e3526c26b5dafec36de8c Yehuda Katz wycats@gmail.com 8a2940914437a47af60d927dfad427dc7594a5e5 Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/a869557e886ed1aa35e9bd54882a7e03684629a9 a869557e886ed1aa35e9bd54882a7e03684629a9

2008-07-23T15:37:00-07:00

Fixes open IO issue f6c6b8dce022c040c475ec9bffe62e022c744020 Yehuda Katz wycats@gmail.com ef1f50a3737db3b4234b00e8c0e50d4707a542e1 Michael S. Klishin michael@novemberain.com http://github.com/reframeit/merb-core/commit/0a3d655be79657b99549a5522a13847119c95f4c 0a3d655be79657b99549a5522a13847119c95f4c

2008-07-21T17:33:21-07:00

Move to merb-extlib is almost there. c534fcd382999671e8d0c8642bcf1665ea1db903 Michael S. Klishin michael@novemberain.com 4bf449725540b0f51e8f116d7742568d95726f02 Michael S. Klishin michael@novemberain.com http://github.com/reframeit/merb-core/commit/ef1f50a3737db3b4234b00e8c0e50d4707a542e1 ef1f50a3737db3b4234b00e8c0e50d4707a542e1

2008-07-21T17:17:04-07:00

Output a warning about merb-extlib if it can't be loaded. 4d0d7c8c4c96ba68beb85982ee8cbb292afa8eed Michael S. Klishin michael@novemberain.com 8a2940914437a47af60d927dfad427dc7594a5e5 cffcacbb528ab20a8cab725434a573da17c16dde Michael S. Klishin michael@novemberain.com http://github.com/reframeit/merb-core/commit/4bf449725540b0f51e8f116d7742568d95726f02 4bf449725540b0f51e8f116d7742568d95726f02

2008-07-21T15:30:28-07:00

Merge branch 'generator_inclusion' into new-merb-gen * generator_inclusion: added add_generators, which allows plugins to load their own generator in the same way as rakefiles 10df5e71e19d4007b9e6024636c2d80b127a88c8 Michael S. Klishin michael@novemberain.com 237c115c4a2be9f7e9b24de0224c494dbe6e6336 defdabd8df298863a2704d66c6d1054058a9d84f Yehuda Katz wycats@gmail.com http://github.com/reframeit/merb-core/commit/8a2940914437a47af60d927dfad427dc7594a5e5 8a2940914437a47af60d927dfad427dc7594a5e5

2008-07-21T13:44:15-07:00

Resolved conflict. 7bc8693468dc29362facec77737f7398d97731e0 Yehuda Katz wycats@gmail.com c63375986e5111b00cd66c9dc608f216d5069d15 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/reframeit/merb-core/commit/defdabd8df298863a2704d66c6d1054058a9d84f defdabd8df298863a2704d66c6d1054058a9d84f

2008-07-21T12:03:27-07:00

Applying patch to allow use of thin_turbo adapter. Thanks dkubb! 6a0cc969f64d66c8fee1682ca55bb2572621758b Wayne E. Seguin wayneeseguin@gmail.com 3aff23978752336b0522e030664135e51281a1dc c63375986e5111b00cd66c9dc608f216d5069d15 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/reframeit/merb-core/commit/cffcacbb528ab20a8cab725434a573da17c16dde cffcacbb528ab20a8cab725434a573da17c16dde

2008-07-20T14:32:06-07:00

Merge commit 'origin/master' into generator_inclusion 3d95df04179a48a314d8219a1413ae323affd20b Jonas Nicklas jonas.nicklas@gmail.com c1b4cbcd1c85674551d4bc5fa068611a75e9a5de Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/reframeit/merb-core/commit/237c115c4a2be9f7e9b24de0224c494dbe6e6336 237c115c4a2be9f7e9b24de0224c494dbe6e6336

2008-07-20T14:08:04-07:00

Did I really commit that? 2bca145c1b1023250da9c91e57b037486ae852dc Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 047a5fe76be7525750b605364c02139f04505b27 Michael S. Klishin michael@novemberain.com http://github.com/reframeit/merb-core/commit/c63375986e5111b00cd66c9dc608f216d5069d15 c63375986e5111b00cd66c9dc608f216d5069d15

2008-07-20T11:01:15-07:00

Use :info as default log level for now: people wonder "where the output is gone". bc052da325e0817f97c5d465a39f9ee0335ba05d Michael S. Klishin michael@novemberain.com bf37243fc8aa4eee1cc41f2504f3261f4dc03b46 Michael S. Klishin michael@novemberain.com http://github.com/reframeit/merb-core/commit/047a5fe76be7525750b605364c02139f04505b27 047a5fe76be7525750b605364c02139f04505b27

2008-07-20T10:02:31-07:00

Make sure default config has log level of error so template inlining bootloader won't dump everything to the tty. ce4a512ad69390be1b59d5cd991dea3ccb8de24f Michael S. Klishin michael@novemberain.com