a836c3eb7a785a6412161c99239ebbaf33685bb3 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/133111d5ee518c17ba8b78d00fb1961b9f66d036 133111d5ee518c17ba8b78d00fb1961b9f66d036 2009-02-09T17:16:06-08:00 2009-02-09T17:16:06-08:00 [merb_datamapper]Removed a temp monkey patch to fix an issue with DM::Timestamps. Not required anymore since DM fixed this bug. 92f51f5285d240fc0ebcd36d69aa3f24320acbba Matt Aimonetti mattaimonetti@gmail.com 1200f810897009cdbb7ebf551b654d4341550ff6 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/a836c3eb7a785a6412161c99239ebbaf33685bb3 a836c3eb7a785a6412161c99239ebbaf33685bb3 2009-02-06T13:47:04-08:00 2009-02-06T13:47:04-08:00 fixed a typo in a generated request spec 851a9e9d06d849031f5fe3f00d2a55c9b52ce3e5 Matt Aimonetti mattaimonetti@gmail.com f1f29c9e8673a4ae694e74c4165d2e73015f58be Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/1200f810897009cdbb7ebf551b654d4341550ff6 1200f810897009cdbb7ebf551b654d4341550ff6 2009-02-06T13:40:42-08:00 2009-02-06T13:40:42-08:00 fixed merb-auth-slice-password version 3 73cac3ce1be624f6c4ea2667d44e94a0117a48ce Matt Aimonetti mattaimonetti@gmail.com b6a08b0004438f4ca1731bff5643cb37a4606345 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/f1f29c9e8673a4ae694e74c4165d2e73015f58be f1f29c9e8673a4ae694e74c4165d2e73015f58be 2009-02-06T13:28:46-08:00 2009-02-06T13:28:46-08:00 fixed some merge issues with last cherry-picking and fixed a Ruby 1.9.1 related bug e3e1cc109e3b1627edf532c804cbc0d2c4eb0a2c Matt Aimonetti mattaimonetti@gmail.com 10c2b93087fbddc3d3c98261fe27d0dbfd43d4d4 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/b6a08b0004438f4ca1731bff5643cb37a4606345 b6a08b0004438f4ca1731bff5643cb37a4606345 2009-02-06T13:00:14-08:00 2009-02-05T13:14:11-08:00 [merb-helpers] Added specs and implementation for unbound form helpers. Helpers should always default the :id to the :name unless an explicit :id is passed in 4d5bec39fa9c84bc3b48be1efb675e14ae066d52 Matt Aimonetti mattaimonetti@gmail.com 608d10838a94271289da86371dd53d714f67ce39 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/10c2b93087fbddc3d3c98261fe27d0dbfd43d4d4 10c2b93087fbddc3d3c98261fe27d0dbfd43d4d4 2009-02-06T12:56:01-08:00 2009-02-05T04:18:13-08:00 Updated the form helper spec suite with extensive coverage of the label functionality on all bound and unbound field helpers. Also includes fixes to the merb-forms to make specs pass. f9a94348a14f18302760c583528400df69b641c3 Matt Aimonetti mattaimonetti@gmail.com f0155b47254390468f1afcfb86c386bb95dce81f Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/608d10838a94271289da86371dd53d714f67ce39 608d10838a94271289da86371dd53d714f67ce39 2009-02-04T15:34:37-08:00 2009-02-04T15:34:37-08:00 make sure we don't load init.rb twice and we don't run dependency required blocks twice 34018fc2424499b710f93a9cc676392b28b82958 Matt Aimonetti mattaimonetti@gmail.com 4c43369ecdf1fd7c0bbc4f68cd03b415631d2605 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/f0155b47254390468f1afcfb86c386bb95dce81f f0155b47254390468f1afcfb86c386bb95dce81f 2009-02-04T15:31:39-08:00 2009-02-04T15:31:39-08:00 bumped the DO version to 0.9.11 and fixed the merb cache loading issue 055202c146e14fb9ada12ddf8261eb83e0761ba1 Matt Aimonetti mattaimonetti@gmail.com 30e77b268171d4377840c27c5736f3a9641fd5a6 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/4c43369ecdf1fd7c0bbc4f68cd03b415631d2605 4c43369ecdf1fd7c0bbc4f68cd03b415631d2605 2009-02-04T12:32:13-08:00 2009-02-04T12:32:13-08:00 Revert "Prevents init.rb from being loaded twice" as it was causing other issues This reverts commit a86c711fa54c4c433efac83a3eee622605ceb9d8. fe35f3db9913f4a25f2a18966a65643b7f3a0369 Matt Aimonetti mattaimonetti@gmail.com ad3d4d088060fe5e845d10a539fac7b8d8ac1e21 Matthew Ford matt@new-bamboo.co.uk http://github.com/wycats/merb/commit/30e77b268171d4377840c27c5736f3a9641fd5a6 30e77b268171d4377840c27c5736f3a9641fd5a6 2009-02-04T12:16:26-08:00 2009-02-04T10:10:00-08:00 [merb-auth-more] Fix required fields and add optional fields * Fix a bug in required fields * Add an overidable option for optional fields 94afcf0b1c7ce0965882dda030ef4b8530619742 Matt Aimonetti mattaimonetti@gmail.com 1d27895262a5463ad870c4576a7b14447d1f0233 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/ad3d4d088060fe5e845d10a539fac7b8d8ac1e21 ad3d4d088060fe5e845d10a539fac7b8d8ac1e21 2009-02-02T13:12:50-08:00 2009-02-02T13:12:50-08:00 fixed merb-gen to be Ruby 1.9.1 compatible (note that you need templater > 0.5) 6ebe9f9283c0e30b9c3ddd273e5cd630ae326b96 Matt Aimonetti mattaimonetti@gmail.com 78901c9b011afb087028d8343479efb8850b8912 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/1d27895262a5463ad870c4576a7b14447d1f0233 1d27895262a5463ad870c4576a7b14447d1f0233 2009-01-30T15:07:06-08:00 2009-01-30T15:07:06-08:00 Print out an error with BadRequest. ae28652b7c6e07ea0cfd0093e26e3ce0ab76c04b Yehuda Katz wycats@gmail.com 12ec2932499ff5e5acc2bd810101792d8f0372b8 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/78901c9b011afb087028d8343479efb8850b8912 78901c9b011afb087028d8343479efb8850b8912 2009-01-30T14:29:25-08:00 2009-01-30T14:29:05-08:00 Syntax error :-o f6688ac41619565b9af5a70086f55d1d8f828ebb Yehuda Katz wycats@gmail.com 3d1f9a656775427b7e46e7afad0bb35f7739556f Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/12ec2932499ff5e5acc2bd810101792d8f0372b8 12ec2932499ff5e5acc2bd810101792d8f0372b8 2009-01-30T13:54:25-08:00 2009-01-30T13:54:25-08:00 Added some documentation of what the merb_datamapper plugin provides 4702ffed45c482ec6fbdb3289c99ab74c147d48a Jonathan Stott jonathan.stott@gmail.com 7812b1818c214fd79e89b2652dbf1ce3080058a1 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/3d1f9a656775427b7e46e7afad0bb35f7739556f 3d1f9a656775427b7e46e7afad0bb35f7739556f 2009-01-30T12:59:03-08:00 2009-01-25T14:35:10-08:00 Make use of repository block wrapping optional. [Fixes #26] Previously, repository blocks were compulsary, which can cause issues when using multiple repositories. 49d1af7434ea33a636540dd7129c034352b9138b Jonathan Stott jonathan.stott@gmail.com 39008c94afd4c9a20c38b99b919ed935afa3b0d8 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/7812b1818c214fd79e89b2652dbf1ce3080058a1 7812b1818c214fd79e89b2652dbf1ce3080058a1 2009-01-30T11:06:06-08:00 2009-01-28T20:11:28-08:00 [merb-helpers] Added Fix for Merb bug (#1138) where bound checkboxes are always marked as checked. Added spec that repros the error along with the patch that fixes it (from cult hero). d07714f08ff970708ee8bdd1dfff1d0118c5731a Matt Aimonetti mattaimonetti@gmail.com 07ac9516d360d15341bc379f3a08881d66437121 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/39008c94afd4c9a20c38b99b919ed935afa3b0d8 39008c94afd4c9a20c38b99b919ed935afa3b0d8 2009-01-30T11:04:55-08:00 2009-01-28T21:36:43-08:00 Adding :checked option for radio_button with specs c07f67b5821798543e6c88a1aae7cd7038e8d8c1 Matt Aimonetti mattaimonetti@gmail.com f33001a3aedf00de6c0633798525bac6a1acebe2 5d54aa9da31466dacb39961f9ef818244aa14515 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/07ac9516d360d15341bc379f3a08881d66437121 07ac9516d360d15341bc379f3a08881d66437121 2009-01-29T15:35:12-08:00 2009-01-29T15:35:12-08:00 Merge commit 'mklishin/1.0.x' into 1.0.x bf2b7a1a92377e8dfb4ec1aafd14b0579e7b3d99 Yehuda Katz wycats@gmail.com c3b5776567ef31055cf6ff0727b1957acaf14260 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/f33001a3aedf00de6c0633798525bac6a1acebe2 f33001a3aedf00de6c0633798525bac6a1acebe2 2009-01-29T15:32:48-08:00 2009-01-29T15:32:48-08:00 Add support for memory monitoring to the merb master 38fc7bc1b3e6d1cd5274ed2c1c4c781b66c5aae6 Yehuda Katz wycats@gmail.com a86c711fa54c4c433efac83a3eee622605ceb9d8 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/5d54aa9da31466dacb39961f9ef818244aa14515 5d54aa9da31466dacb39961f9ef818244aa14515 2009-01-29T11:35:25-08:00 2009-01-29T11:33:46-08:00 Revert "[merb-haml] Use Mash instead of overly clever code with inject" This reverts commit 033ded037567d7c7bde0e28bc201c80768c37c13. This change caused template engine options be never passed to HAML engine. 93501b360acd7b0cf4dbe43ea0884d3c889edbba Michael S. Klishin michael@novemberain.com 1d1cdcacbea508fda84ea4acfa2d05bd3e40b2c1 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/a86c711fa54c4c433efac83a3eee622605ceb9d8 a86c711fa54c4c433efac83a3eee622605ceb9d8 2009-01-29T11:35:25-08:00 2009-01-29T11:33:34-08:00 Prevents init.rb from being loaded twice 8babac679ae2292d9782ccf34ab20851d1a655ac Michael S. Klishin michael@novemberain.com 657b0e467f46844502813a932d3f27103787a58d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/c3b5776567ef31055cf6ff0727b1957acaf14260 c3b5776567ef31055cf6ff0727b1957acaf14260 2009-01-19T00:19:54-08:00 2009-01-19T00:19:54-08:00 Add merb-core to the list of dependencies de3442b94e1178916d7e5698b19513448808d702 Yehuda Katz wycats@gmail.com 56ab0f1a9d3c6fec10a67fe3c57399e7f4b5a6dc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/657b0e467f46844502813a932d3f27103787a58d 657b0e467f46844502813a932d3f27103787a58d 2009-01-18T23:53:57-08:00 2009-01-18T23:53:57-08:00 Bump version a3e4476e5b0b208c98f2d3fcd2c81dade242c3c1 Yehuda Katz wycats@gmail.com 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