44b5cd60601a118ab66a6f9d50262a1db01ef839 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/340520f683fc8a5d4232e043286edfc92dee2dec 340520f683fc8a5d4232e043286edfc92dee2dec 2008-09-13T12:51:51-07:00 2008-09-13T12:51:51-07:00 Correct dm-* tasks. 1ba0269eae03115c42efe8cfff53bbd3fd18b439 Michael S. Klishin michael@novemberain.com 35c5d966d4b371c91a87a50fe5e0d28da74e9482 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/44b5cd60601a118ab66a6f9d50262a1db01ef839 44b5cd60601a118ab66a6f9d50262a1db01ef839 2008-09-13T08:37:12-07:00 2008-09-13T08:37:12-07:00 Now merb.thor actually pulls down dm-core and dm-more... b8f7a88b49e2042de73756feb963a02475cf555b Fabien Franzen info@atelierfabien.be 5b7d03c778aac5186c5ef017b0b68126928c1b28 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/35c5d966d4b371c91a87a50fe5e0d28da74e9482 35c5d966d4b371c91a87a50fe5e0d28da74e9482 2008-09-13T08:16:03-07:00 2008-09-13T08:16:03-07:00 Fixed stupidly tiny bug 8afe7751a73a718102b1970ce31803d72a59da13 Fabien Franzen info@atelierfabien.be 34daac6923b1ef0ccee6a582686db83d5c276199 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/5b7d03c778aac5186c5ef017b0b68126928c1b28 5b7d03c778aac5186c5ef017b0b68126928c1b28 2008-09-13T06:59:44-07:00 2008-09-13T06:59:44-07:00 Merb's Thor scripts (merb.thor) are now generated into apps by merb-gen 1c520b3093e7235a1361f9ed776ae31916c9ad51 Fabien Franzen info@atelierfabien.be 81b9378d097981ab6d3df43fa04c1a069cc383c8 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/34daac6923b1ef0ccee6a582686db83d5c276199 34daac6923b1ef0ccee6a582686db83d5c276199 2008-09-13T06:19:38-07:00 2008-09-13T06:19:38-07:00 Fixed generator templates to work with the *new* bundle logic ced5f5f088a3a69837f37f160ed3047eb9c308b0 Fabien Franzen info@atelierfabien.be 9c4918e75348850a2bd7dc8298ac5a5080c6bc83 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/81b9378d097981ab6d3df43fa04c1a069cc383c8 81b9378d097981ab6d3df43fa04c1a069cc383c8 2008-09-12T15:47:45-07:00 2008-09-12T15:47:45-07:00 Added empty ./gems dir for merb-gen app (and --flat) be58f495b4f0765f328163ba2d51cf1ed3b06cfe Fabien Franzen info@atelierfabien.be 0cfddcb6d5a6e921064b369c4bb2252ae2249a08 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/9c4918e75348850a2bd7dc8298ac5a5080c6bc83 9c4918e75348850a2bd7dc8298ac5a5080c6bc83 2008-09-12T15:29:55-07:00 2008-09-12T15:29:55-07:00 Removed merb-gen scripts in favor of merb.thor - use bin/merb and bin/merb-gen e1e9b71756915ead88adbcded3c4c283742f1267 Fabien Franzen info@atelierfabien.be 41546c80f864550c720f8cacb135df0546b23c7c Bryan Ray bryansray@gmail.com http://github.com/wycats/merb-more/commit/0cfddcb6d5a6e921064b369c4bb2252ae2249a08 0cfddcb6d5a6e921064b369c4bb2252ae2249a08 2008-09-12T05:09:18-07:00 2008-09-12T00:02:20-07:00 Removed the reference to the delete_button form helper that was generated in the resource controller. * delete_button no longer exists as of 0.9.6 Signed-off-by: Michael S. Klishin <michael@novemberain.com> dba06c65b5f0d28707f9830de25ed9b7fd24b191 Michael S. Klishin michael@novemberain.com 4c02e9c553cc1ba8b63e6fd0b7f81abaa047b8bd 8453e200a0194ce397094526b44fe56ca4fac850 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/41546c80f864550c720f8cacb135df0546b23c7c 41546c80f864550c720f8cacb135df0546b23c7c 2008-09-11T09:56:06-07:00 2008-09-11T09:56:06-07:00 Merge branch 'master' of git@github.com:wycats/merb-more 0e8cdfb5ab345bc02909a4dfa1d9467eb2fac203 Fabien Franzen info@atelierfabien.be 15ec1c29b9fcdab16ac33105dd52fb351f8feba4 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/4c02e9c553cc1ba8b63e6fd0b7f81abaa047b8bd 4c02e9c553cc1ba8b63e6fd0b7f81abaa047b8bd 2008-09-11T09:55:35-07:00 2008-09-11T09:55:35-07:00 Removed deprecated gemspec#autorequire 00a9cf5bfa6c3f09a3b29351c3e55e84d1d0f950 Fabien Franzen info@atelierfabien.be 2dec0ad7b7d3a11be5fa718634b1d6e5ffe9a61e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/8453e200a0194ce397094526b44fe56ca4fac850 8453e200a0194ce397094526b44fe56ca4fac850 2008-09-09T18:21:46-07:00 2008-09-09T18:21:46-07:00 Make PartController check if partial locals storage exists. ea51f3447f3ad47a0bda2d7225d66fafd9fa8629 Michael S. Klishin michael@novemberain.com 11ad5fc460afb9cd3448e533236c6fd00938e988 Bryan Ray bryansray@gmail.com http://github.com/wycats/merb-more/commit/2dec0ad7b7d3a11be5fa718634b1d6e5ffe9a61e 2dec0ad7b7d3a11be5fa718634b1d6e5ffe9a61e 2008-09-09T18:20:03-07:00 2008-09-01T09:07:02-07:00 This adds a little more clarity to the init.rb template for adding an apps dependencies. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 9f90168134471731c43fce342ccc93eb849ee942 Michael S. Klishin michael@novemberain.com 80fabf44af0c69f38ee1aaf4a6531ab2a9c81144 Bryan Ray bryansray@gmail.com http://github.com/wycats/merb-more/commit/11ad5fc460afb9cd3448e533236c6fd00938e988 11ad5fc460afb9cd3448e533236c6fd00938e988 2008-09-09T18:11:44-07:00 2008-09-09T17:30:58-07:00 Changed the copyright year to be current in the generator templates. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 91b9685be31b3ad0d0c2d36da55a16a84211b371 Michael S. Klishin michael@novemberain.com 15ec1c29b9fcdab16ac33105dd52fb351f8feba4 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/80fabf44af0c69f38ee1aaf4a6531ab2a9c81144 80fabf44af0c69f38ee1aaf4a6531ab2a9c81144 2008-09-09T10:28:54-07:00 2008-09-09T10:28:54-07:00 removed debug statement ad40234d671e0d7ffa651f567a1a88c2ca47daa5 Jonas Nicklas jonas.nicklas@gmail.com 745386a9b46faaa1e56c5c19b9387b3b9b3fa61f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/15ec1c29b9fcdab16ac33105dd52fb351f8feba4 15ec1c29b9fcdab16ac33105dd52fb351f8feba4 2008-09-08T15:41:22-07:00 2008-09-08T15:41:22-07:00 Bump up versions. 6a4db7af0ee6493977289be6bde6a32ee13977c2 Michael S. Klishin michael@novemberain.com 6d1284d72992c731cfc4d758f592c085285d5c7c Justin S. Leitgeb jsl@hcoop.net http://github.com/wycats/merb-more/commit/745386a9b46faaa1e56c5c19b9387b3b9b3fa61f 745386a9b46faaa1e56c5c19b9387b3b9b3fa61f 2008-09-07T17:06:34-07:00 2008-09-07T17:06:34-07:00 Templater 0.2 fixes e56766eff491a60cb1e7898e22b80ec90b7176f3 Justin S. Leitgeb jsl@hcoop.net 08f1d02ae27837e1efde2f0b3af89ffe9b2f126c Justin S. Leitgeb jsl@hcoop.net http://github.com/wycats/merb-more/commit/6d1284d72992c731cfc4d758f592c085285d5c7c 6d1284d72992c731cfc4d758f592c085285d5c7c 2008-09-07T16:37:13-07:00 2008-09-07T16:37:13-07:00 Change mailer generator to 0.2 templater syntax 6bdb77f49b5d0abac63d7a31f37364eb304b97d4 Justin S. Leitgeb jsl@hcoop.net 225d4a888c30cd9f098758504d851f774e798175 Justin S. Leitgeb jsl@hcoop.net http://github.com/wycats/merb-more/commit/08f1d02ae27837e1efde2f0b3af89ffe9b2f126c 08f1d02ae27837e1efde2f0b3af89ffe9b2f126c 2008-09-07T16:27:59-07:00 2008-09-07T16:27:59-07:00 Fix some tests broken by changing reference from README to README.textile 26de03dce2f4a6791748132ed87b5cf8135c7b32 Justin S. Leitgeb jsl@hcoop.net cf3350e09c0e787aeb354beab6d30ea3de1f2eb1 Jack Dempsey jack.dempsey@gmail.com http://github.com/wycats/merb-more/commit/225d4a888c30cd9f098758504d851f774e798175 225d4a888c30cd9f098758504d851f774e798175 2008-09-07T10:50:34-07:00 2008-09-07T10:50:34-07:00 merb-freezer is now gone 08f5170f57f4b2a77d68b75b8220fa1474ccd889 Jack Dempsey jack.dempsey@gmail.com feec1edbce1a16d2110834a4e4e1b787d194c9d1 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/cf3350e09c0e787aeb354beab6d30ea3de1f2eb1 cf3350e09c0e787aeb354beab6d30ea3de1f2eb1 2008-09-07T10:02:05-07:00 2008-09-07T10:02:05-07:00 Merged in new bundling (aka freezer) branch 6216a7acfe53748adb28a12c46e642a7cbf33a95 Fabien Franzen info@atelierfabien.be 569d63980285f6027499270b8bd51eed500f4151 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/feec1edbce1a16d2110834a4e4e1b787d194c9d1 feec1edbce1a16d2110834a4e4e1b787d194c9d1 2008-09-07T09:44:35-07:00 2008-09-07T09:44:35-07:00 Merged in new-sessions branch e8a7fb4fcd18eac9cd26e49ec0c12ad7b5fc3f7a Fabien Franzen info@atelierfabien.be 0c5c693ac5fcc823ffb6d08029b352e38c38e786 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/569d63980285f6027499270b8bd51eed500f4151 569d63980285f6027499270b8bd51eed500f4151 2008-09-06T15:06:00-07:00 2008-09-06T15:06:00-07:00 bumped up templater dependency version 693b9be9c8edea5a4821e4a2ff3c61fddfdbd287 Jonas Nicklas jonas.nicklas@gmail.com aa664db3d427310c322bc521d68918cc7fec49bd Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/0c5c693ac5fcc823ffb6d08029b352e38c38e786 0c5c693ac5fcc823ffb6d08029b352e38c38e786 2008-09-06T14:55:14-07:00 2008-09-06T06:05:43-07:00 adapted merb-gen to templater 0.2 syntax f541234badff9d76d9166918f2da60f6f7ac5f5e Jonas Nicklas jonas.nicklas@gmail.com 78ff55f27c363988fa783295c95fda566dd9a03e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/aa664db3d427310c322bc521d68918cc7fec49bd aa664db3d427310c322bc521d68918cc7fec49bd 2008-09-06T02:06:31-07:00 2008-09-06T02:06:31-07:00 Consolidating raw Rakefile commands to merb-core/tasks/merb_rake_helper.rb 17d23c40be0b8b8d896e79d05bdb5e49c4d76e4b Fabien Franzen info@atelierfabien.be 0ac0b607a102e5287803fcd65b67fa8463c94834 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/78ff55f27c363988fa783295c95fda566dd9a03e 78ff55f27c363988fa783295c95fda566dd9a03e 2008-09-06T00:51:40-07:00 2008-09-06T00:51:40-07:00 Slice routing r.add_slice :you_slice_name now works (snake_case vs. camel_case) 249e2de4e37c256d77ea63017c6745f529102a39 Fabien Franzen info@atelierfabien.be de3937b785ca8b01c30f085144636cb768d218c4 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/0ac0b607a102e5287803fcd65b67fa8463c94834 0ac0b607a102e5287803fcd65b67fa8463c94834 2008-09-05T16:33:08-07:00 2008-09-05T16:33:08-07:00 Set to UTF8 for generated applications. a5732b52661a8d43883ebfddd3863dc7b5ad7e1e Michael S. Klishin michael@novemberain.com 48ccc75c047eb096751c8e91d501fa3e954d0c15 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl http://github.com/wycats/merb-more/commit/de3937b785ca8b01c30f085144636cb768d218c4 de3937b785ca8b01c30f085144636cb768d218c4 2008-09-05T16:02:56-07:00 2008-07-08T03:18:02-07:00 Fix Merb::Mailer to work properly when attaching multiple files at once Signed-off-by: Michael S. Klishin <michael@novemberain.com> 1043dd02aa2d1ff2bfdf2353d143d219355f1367 Michael S. Klishin michael@novemberain.com ee7f22903f9b3cbab3280847e98fab9aa318a04b Bryan Ray bryansray@gmail.com http://github.com/wycats/merb-more/commit/48ccc75c047eb096751c8e91d501fa3e954d0c15 48ccc75c047eb096751c8e91d501fa3e954d0c15 2008-09-05T16:02:44-07:00 2008-08-28T21:44:10-07:00 Ticket #206 - This cleans up the merb-haml template generators to be compatible with the form_helper changes. Signed-off-by: Michael S. Klishin <michael@novemberain.com> b16377efee0f84553802dc5024a2d9c04bad8228 Michael S. Klishin michael@novemberain.com c2114fa5ecbf78938ddec19b78e489c6e5717c2e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/ee7f22903f9b3cbab3280847e98fab9aa318a04b ee7f22903f9b3cbab3280847e98fab9aa318a04b 2008-09-05T08:12:53-07:00 2008-09-05T08:12:53-07:00 Language::English::Inflect => English::Inflect name changes c3325867cb37c1b3a5b2fc6f0e1ea3afc320db66 Fabien Franzen info@atelierfabien.be 866a474aa142c4d1bff8991700e6f0724c6de6fa Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/c2114fa5ecbf78938ddec19b78e489c6e5717c2e c2114fa5ecbf78938ddec19b78e489c6e5717c2e 2008-09-02T10:08:23-07:00 2008-09-02T10:08:23-07:00 Fixed typo in generated config/init.rb b06c35e76169ba5722de06d15cddbfcddbe439f6 Fabien Franzen info@atelierfabien.be