9e045216f88e126806ba3d94fd570cacab07a2d8 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/56ab0f1a9d3c6fec10a67fe3c57399e7f4b5a6dc 56ab0f1a9d3c6fec10a67fe3c57399e7f4b5a6dc 2009-01-18T23:53:42-08:00 2009-01-18T23:53:42-08:00 merb_datamapper should hack around a bug in set_timestamps 350dceb4d9c08ff516d2b58543c1169c3f799bf8 Yehuda Katz wycats@gmail.com 35a5645e95eeebe414aa08a417110bb98f615193 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/9e045216f88e126806ba3d94fd570cacab07a2d8 9e045216f88e126806ba3d94fd570cacab07a2d8 2009-01-18T23:53:26-08:00 2009-01-18T23:53:26-08:00 The merb metagem should include dm-serializer 043f272522d2f292063ef40219a4f068ed39eaad Yehuda Katz wycats@gmail.com 2133418d4eb1aa801f7a1fa5aa24fa6fd20655a7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/35a5645e95eeebe414aa08a417110bb98f615193 35a5645e95eeebe414aa08a417110bb98f615193 2009-01-18T23:53:13-08:00 2009-01-18T23:53:13-08:00 Generate code to set up a default cache to merb-gen app d4f9d86ab5ee3378b25b1fc22ab95ac4fc84ad22 Yehuda Katz wycats@gmail.com 1f47271ac2d6b75c84141e8bb0e383571f63da7a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/2133418d4eb1aa801f7a1fa5aa24fa6fd20655a7 2133418d4eb1aa801f7a1fa5aa24fa6fd20655a7 2009-01-18T23:52:58-08:00 2009-01-18T23:52:58-08:00 Update jQuery to 1.3 80ce5b61439647d63e013ee27f9ec364cc77416d Yehuda Katz wycats@gmail.com 82b14c8bf2ede04020264b23c88a3d18c54ac000 775340ccfebec384216d22dfc0ee3a6dda863547 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/1f47271ac2d6b75c84141e8bb0e383571f63da7a 1f47271ac2d6b75c84141e8bb0e383571f63da7a 2009-01-16T13:58:37-08:00 2009-01-16T13:58:37-08:00 Merge commit 'ben/regs/head/merb_dm_set_fix' into 1.0.x c0ce5ae887ff7627474e7010518a3a0ddc517b77 Yehuda Katz wycats@gmail.com 7742f23d2d20e46bca7596fbe33987c72035095b 03653454ec55cc8317dc3f9e80fc73c5917073ea Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/82b14c8bf2ede04020264b23c88a3d18c54ac000 82b14c8bf2ede04020264b23c88a3d18c54ac000 2009-01-16T13:48:46-08:00 2009-01-16T13:48:46-08:00 Merge commit 'namelessjon/merb_datamapper_improvements' into 1.0.x b6bcd5b7efe9f6927bb3535eb41dcfde5c9a2b2e Yehuda Katz wycats@gmail.com 30706f023c4361752ed0db7df389cc5aa85485c1 Ben Burkert ben@benburkert.com http://github.com/wycats/merb/commit/775340ccfebec384216d22dfc0ee3a6dda863547 775340ccfebec384216d22dfc0ee3a6dda863547 2009-01-16T13:03:29-08:00 2009-01-16T13:03:29-08:00 Fix to avoid simultaneously updating and iterating on a single set. 6ae22c73ed0d7ab361a6726402a87fa56d135293 Ben Burkert ben@benburkert.com 758d39c3535f972d0b6bc5f1fbcb2d8629405b26 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/03653454ec55cc8317dc3f9e80fc73c5917073ea 03653454ec55cc8317dc3f9e80fc73c5917073ea 2009-01-16T12:56:09-08:00 2009-01-16T12:56:09-08:00 Reworking specs in a style closer to merb_sequel specs, so that things work cleanly d5431f5546fc522e4d60bd4143f3769400a339da Jonathan Stott jonathan.stott@gmail.com 30706f023c4361752ed0db7df389cc5aa85485c1 1d1cdcacbea508fda84ea4acfa2d05bd3e40b2c1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/7742f23d2d20e46bca7596fbe33987c72035095b 7742f23d2d20e46bca7596fbe33987c72035095b 2009-01-16T12:41:06-08:00 2009-01-16T12:41:06-08:00 Merge commit 'mklishin/1.0.x' into 1.0.x 5a507fe9bf929d32805e5fb79f7545d0a3b709a2 Yehuda Katz wycats@gmail.com fde34768766998f9e815fb8bb1b4284bc1336d73 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/758d39c3535f972d0b6bc5f1fbcb2d8629405b26 758d39c3535f972d0b6bc5f1fbcb2d8629405b26 2009-01-16T12:15:02-08:00 2009-01-16T12:15:02-08:00 Removed generator specs, which mostly just tested merb-gen itself aaa44d9f1a08e7dc5c2d92195fba1d2c7e1ea0a6 Jonathan Stott jonathan.stott@gmail.com 033ded037567d7c7bde0e28bc201c80768c37c13 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/1d1cdcacbea508fda84ea4acfa2d05bd3e40b2c1 1d1cdcacbea508fda84ea4acfa2d05bd3e40b2c1 2009-01-16T12:10:20-08:00 2009-01-16T12:10:20-08:00 When Webrat is missing, only print warning, do not raise 2f92a8445d7974c7438df78f86761505dca2961a Michael S. Klishin michael@novemberain.com 46619a5728cb867def9224f910aa4d097b4f554e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/033ded037567d7c7bde0e28bc201c80768c37c13 033ded037567d7c7bde0e28bc201c80768c37c13 2009-01-16T12:08:41-08:00 2009-01-13T14:41:04-08:00 [merb-haml] Use Mash instead of overly clever code with inject d06337a080d4c2db97f25b495f6f76b50446eee7 Michael S. Klishin michael@novemberain.com 4c81ac2dedc02ce2c001741b49bed40e2c72ce09 fde34768766998f9e815fb8bb1b4284bc1336d73 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/30706f023c4361752ed0db7df389cc5aa85485c1 30706f023c4361752ed0db7df389cc5aa85485c1 2009-01-16T12:08:34-08:00 2009-01-16T12:08:34-08:00 Merge commit 'namelessjon/merb_datamapper_improvements' into 1.0.x dab16a0ee3fcdc6c78401b562497d7d962e020f5 Yehuda Katz wycats@gmail.com aaeef54b2e728b6575273a02b4eab6c91277ea10 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/fde34768766998f9e815fb8bb1b4284bc1336d73 fde34768766998f9e815fb8bb1b4284bc1336d73 2009-01-16T12:02:17-08:00 2009-01-16T12:02:17-08:00 Added brief changelog bca5b03077f28a3f8fc9b8d47a201b2201074768 Jonathan Stott jonathan.stott@gmail.com 205a8e15235794d762cca425369b075da0ce62a7 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/aaeef54b2e728b6575273a02b4eab6c91277ea10 aaeef54b2e728b6575273a02b4eab6c91277ea10 2009-01-16T11:47:38-08:00 2009-01-16T11:47:38-08:00 Added wrapping of call_action in the repository block example code provided by dkubb 331437674185f1cf8e4bcaea32fbf288e65e8a73 Jonathan Stott jonathan.stott@gmail.com b7d0aec167ea18f100bdda0bff528ca32a0f93e9 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/205a8e15235794d762cca425369b075da0ce62a7 205a8e15235794d762cca425369b075da0ce62a7 2009-01-16T11:43:33-08:00 2009-01-16T11:43:33-08:00 Applied patch from jackdempsey to correct generator output 45d5daaf684f5d2f4cda3d82a01a5a02c01fbc90 Jonathan Stott jonathan.stott@gmail.com 36e750b35d8a8b3f25e6d47c5c4e7c5b1ea54227 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/b7d0aec167ea18f100bdda0bff528ca32a0f93e9 b7d0aec167ea18f100bdda0bff528ca32a0f93e9 2009-01-16T11:38:55-08:00 2009-01-16T11:38:55-08:00 Removed useless migration option ef2a8c51f9b2cd968129235c959c528ec2e2b906 Jonathan Stott jonathan.stott@gmail.com 46619a5728cb867def9224f910aa4d097b4f554e Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/36e750b35d8a8b3f25e6d47c5c4e7c5b1ea54227 36e750b35d8a8b3f25e6d47c5c4e7c5b1ea54227 2009-01-16T11:27:18-08:00 2009-01-16T11:27:18-08:00 Removed the session spec which doesn't test anything right now c0bdc50607e64c77352a41def5e576c6fb494b21 Jonathan Stott jonathan.stott@gmail.com 46619a5728cb867def9224f910aa4d097b4f554e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/4c81ac2dedc02ce2c001741b49bed40e2c72ce09 4c81ac2dedc02ce2c001741b49bed40e2c72ce09 2009-01-16T10:40:56-08:00 2009-01-16T10:40:56-08:00 Add dm-serializer 0fff946438b02d44d4bffd686088d0278829dff6 Yehuda Katz wycats@gmail.com e933cf70ed94bad80c0c3f716ffcab8aa99ca981 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/46619a5728cb867def9224f910aa4d097b4f554e 46619a5728cb867def9224f910aa4d097b4f554e 2009-01-16T10:32:28-08:00 2009-01-16T10:32:28-08:00 Bump DM versions and make DO explicit. 8a049863db17568cf3a083843010af9fdb829b36 Yehuda Katz wycats@gmail.com e1e8ea4635885a048136225646ae0752d8c63dc3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/e933cf70ed94bad80c0c3f716ffcab8aa99ca981 e933cf70ed94bad80c0c3f716ffcab8aa99ca981 2009-01-16T10:20:40-08:00 2009-01-16T10:20:40-08:00 Fixes Rando's issue [#1182 state:resolved]: * Merb middleware no longer incompatible with normal middleware. d956e8deeaba01b3d843bfaad6d510cec51d2a89 Yehuda Katz wycats@gmail.com 1c9ded60897d0a0f8cedb2c71a921ad9cf3f6bf5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/e1e8ea4635885a048136225646ae0752d8c63dc3 e1e8ea4635885a048136225646ae0752d8c63dc3 2009-01-16T10:19:12-08:00 2009-01-16T10:19:12-08:00 Fixes bug where pid gets overwritten in -i or -r mode. [#1141 state:resolved] 11c29e49fe0a2423ce6db73ae55c25fa8dfba7e4 Yehuda Katz wycats@gmail.com 0b4529b6c6563bdec398bf818c420df13ef1fdf5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/1c9ded60897d0a0f8cedb2c71a921ad9cf3f6bf5 1c9ded60897d0a0f8cedb2c71a921ad9cf3f6bf5 2009-01-10T19:08:33-08:00 2009-01-10T19:08:33-08:00 Accept rando's patch to support setting cookies via the request helper 8ebfc05968fc5feb28d79c5628f1384ff0b54c06 Yehuda Katz wycats@gmail.com 1d088fdb1c130a7bc4adffb9a646498623aad6af Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/0b4529b6c6563bdec398bf818c420df13ef1fdf5 0b4529b6c6563bdec398bf818c420df13ef1fdf5 2009-01-10T19:06:49-08:00 2009-01-10T19:06:49-08:00 Bump version 45963094bf7b22390a1f99bd56d8537a4f4587bf Yehuda Katz wycats@gmail.com f82cd530f57e9662e4ab75fa262d460ee4382afa Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/1d088fdb1c130a7bc4adffb9a646498623aad6af 1d088fdb1c130a7bc4adffb9a646498623aad6af 2008-12-31T01:13:25-08:00 2008-12-31T01:13:25-08:00 Fixed issues in merb-gen thor eb264147cd03da3be9ab94bc26d6ae7f1c16e6b4 Yehuda Katz wycats@gmail.com 30d90d39595d291496e674f2bd79d7777467fa73 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/f82cd530f57e9662e4ab75fa262d460ee4382afa f82cd530f57e9662e4ab75fa262d460ee4382afa 2008-12-31T00:00:49-08:00 2008-12-31T00:00:49-08:00 Fixes dev-mode reloading bug 75de9899ab78f3fca4ca17de3ab982fdbe9d9d3b Yehuda Katz wycats@gmail.com bd456640ba1a970e6796781d2bd25a302695e2aa Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/30d90d39595d291496e674f2bd79d7777467fa73 30d90d39595d291496e674f2bd79d7777467fa73 2008-12-28T16:30:03-08:00 2008-12-28T16:30:03-08:00 Fixes bug in merb-auth caught by step-by-step tester 5891c5cd2206483e5d5b63100549bfd11fabd179 Yehuda Katz wycats@gmail.com b597b9f13ff5db065bda8b1fdd8d6b64bb82b075 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/bd456640ba1a970e6796781d2bd25a302695e2aa bd456640ba1a970e6796781d2bd25a302695e2aa 2008-12-28T15:43:48-08:00 2008-12-28T15:43:48-08:00 Fixes issue with unusual defaults in ActionArgs by using unifier 30fcc4b8ae2240b3a94665382a17135169dde618 Yehuda Katz wycats@gmail.com 529be96fc8cb418709a96f3fd8ed6c20b277c159 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/b597b9f13ff5db065bda8b1fdd8d6b64bb82b075 b597b9f13ff5db065bda8b1fdd8d6b64bb82b075 2008-12-28T15:34:45-08:00 2008-12-16T14:57:20-08:00 Addresses Bug with Merb-Helpers regarding displaying label fields. label("Name", :for => "name") should now be working. Has been fixed with matching specs. Fix for #1055 http://merb.lighthouseapp.com/projects/7433/tickets/1055 159186e7549347e61834ce0a0fe87efc13c7b2b9 Yehuda Katz wycats@gmail.com 3d38b07d424d35c99c60bbd4e51ebd542b544b0e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/529be96fc8cb418709a96f3fd8ed6c20b277c159 529be96fc8cb418709a96f3fd8ed6c20b277c159 2008-12-28T15:31:31-08:00 2008-12-28T15:31:31-08:00 Adds information to defer_to to clear up some confusion 4573619e2a216f40252f0f6d1122600df6f2af8e Yehuda Katz wycats@gmail.com