jnicklas / merb-more fork watch download tarball
public
Fork of wycats/merb-more
Description: Merb More: The Full Stack. Take what you need; leave what you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/jnicklas/merb-more.git
merb-more / Commit History feed

08/17/08

made generators autoload relevant orm/test/template plugins
jnicklas (author)
Sun Aug 17 15:28:40 -0700 2008
commit  ee8f6894526b5fdeb45f278f5d28e320ef12b334
tree    d32e28fc0c9122489d051a01639386b0ef11807a
parent  65cd7bcfa3d62fe99fe63c1946517237a8386e00 
resource generator no longer singularizes parameter
jnicklas (author)
Sun Aug 17 14:40:50 -0700 2008
commit  65cd7bcfa3d62fe99fe63c1946517237a8386e00
tree    413dc02ea1766fd690e29261c59a7c2ca751b03d
parent  73a065417d3c5b0e8178d16ef1fec81aaeb99d34

08/16/08

made comments for rest controller respect namespaces
jnicklas (author)
Sat Aug 16 11:41:40 -0700 2008
commit  73a065417d3c5b0e8178d16ef1fec81aaeb99d34
tree    a6be864313283dffb4964f9f2c03a94c157551e6
parent  6409e9ce7569593fe0ff418ee22ed8e36473e272 
spec helpers now moved into templater (merb gen specs require edge 
templater for now)
jnicklas (author)
Wed Aug 13 15:08:51 -0700 2008
commit  6409e9ce7569593fe0ff418ee22ed8e36473e272
tree    b0bcda4014ef5adbc93f72ac7b6af3cda8c2f92f
parent  a4c4f71333a8dfbc23fa2f861fa74ea2033566d5

08/15/08

suggest rspec not spec for option testing_framework
Gert Goet (author)
Fri Aug 15 06:55:06 -0700 2008
michaelklishin (committer)
Fri Aug 15 13:15:08 -0700 2008
commit  a4c4f71333a8dfbc23fa2f861fa74ea2033566d5
tree    950886d532914e50c56e357218aa67b6aa004757
parent  6b598031ea9a349fa7b7a25fe296189c4c6e93ff

08/14/08

Merge branch 'core_internal_adapt'
michaelklishin (author)
Thu Aug 14 10:06:51 -0700 2008
commit  6b598031ea9a349fa7b7a25fe296189c4c6e93ff
tree    b746c5130b0ab9bb9a49b8d08ad3eb503acc0082
parent  936bf68a51f2fc614bbdfa02b1b649368b8caa73 parent  25e73978a918938d36047149d19228629ee86d45 
Merge branch 'haml_generators'
michaelklishin (author)
Thu Aug 14 10:06:48 -0700 2008
commit  936bf68a51f2fc614bbdfa02b1b649368b8caa73
tree    6f1226c707b518f2d72dcf00f455308626fa9142
parent  87479e11e73a8e12ced3fc92bda2d2182bad5e2e parent  0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b 
Use clear_content to prevent double rendering issues in mails
dbussink (author)
Thu Aug 14 02:50:39 -0700 2008
michaelklishin (committer)
Thu Aug 14 03:25:09 -0700 2008
commit  87479e11e73a8e12ced3fc92bda2d2182bad5e2e
tree    6f1226c707b518f2d72dcf00f455308626fa9142
parent  af16bc43a678a1f0c08e714dbdee22c6824843e4

08/13/08

Fixes merb-more version
wycats (author)
Wed Aug 13 12:10:15 -0700 2008
commit  af16bc43a678a1f0c08e714dbdee22c6824843e4
tree    a790431fe4ef210c05a6e0448906bf751153e91a
parent  6bbf3157e60d009d7821ff4ef0f595cff5c8f309

08/12/08

Bump up versions.
michaelklishin (author)
Tue Aug 12 21:05:51 -0700 2008
commit  6bbf3157e60d009d7821ff4ef0f595cff5c8f309
tree    17162109d84843555634eb85a60a64f55bb7fa38
parent  e9f309ede5289fc80b6ac04e28cd8727f1a63677

08/09/08

made application generator add use_template_engine
jnicklas (author)
Sat Aug 09 14:29:25 -0700 2008
commit  25e73978a918938d36047149d19228629ee86d45
tree    41bb7300fc89bdd742ad85e287d24fe5acf3a70f
parent  ae4003bbbd9e02f86f563f80c37d957a2addd5bd 
adapted merb-gen to new Merb.orm, etc... methods
jnicklas (author)
Sat Aug 09 14:15:20 -0700 2008
commit  ae4003bbbd9e02f86f563f80c37d957a2addd5bd
tree    f3ffc4d5d15885275499bdcb4832267133502bba
parent  e9f309ede5289fc80b6ac04e28cd8727f1a63677 
Merged in HAML generators.
michaelklishin (author)
Sat Aug 09 12:01:23 -0700 2008
commit  e9f309ede5289fc80b6ac04e28cd8727f1a63677
tree    b1582331b26033f785e47f47f16b1b12b038b6ea
parent  0232f1c07806a756e22b4a2488fe35101376020c 
added haml templates for layout, resource_controller and controller 
generators (thanks jonuts)
jnicklas (author)
Sat Aug 09 06:14:17 -0700 2008
commit  0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b
tree    b1582331b26033f785e47f47f16b1b12b038b6ea
parent  eeecf5ff05677b11e39bcf310271dca5a155253d 
made erb template engine explicit for controller generator
jnicklas (author)
Sat Aug 09 05:30:16 -0700 2008
commit  eeecf5ff05677b11e39bcf310271dca5a155253d
tree    80b3917cdd92c7664d866d71c33ceb1bd191613d
parent  0232f1c07806a756e22b4a2488fe35101376020c

08/08/08

Merge branch 'go_up'
michaelklishin (author)
Fri Aug 08 14:35:02 -0700 2008
commit  0232f1c07806a756e22b4a2488fe35101376020c
tree    20ea8a4cd47bcfe2cdbd431858e6ba45fbd02169
parent  48f7e61b84a363c16bf7ca3be23886fa8c08e136 parent  913ebcd3d3390bd8935121bfa2cece18ecb1b9a2 
removed migration invocation from model
jnicklas (author)
Fri Aug 08 04:03:08 -0700 2008
commit  913ebcd3d3390bd8935121bfa2cece18ecb1b9a2
tree    fc20c05cc96d9405d7bfed2adbafe5cad6999e28
parent  becc129670d67971258f42a8bda53661ec2d4d8e 
added some documentation
jnicklas (author)
Fri Aug 08 04:00:38 -0700 2008
commit  becc129670d67971258f42a8bda53661ec2d4d8e
tree    939c68109a0b6bf0ec5356601b412f7f4e785f11
parent  202812e30b9cefc6da520f07b834514460bd2fcd 
Merge branch 'the_move'
michaelklishin (author)
Fri Aug 08 02:46:10 -0700 2008
commit  48f7e61b84a363c16bf7ca3be23886fa8c08e136
tree    e6be5574fc211f6456b897e860048e24a28fa17c
parent  496851823daac87de7515ad0ff3431014054dec3 parent  1ea6ec7f0d68357a23308c81d421117261e96af0 
added go up method and specced with_modules method
jnicklas (author)
Fri Aug 08 01:29:11 -0700 2008
commit  202812e30b9cefc6da520f07b834514460bd2fcd
tree    bfbfe2685cce45774ed3d62d18b5332b7cbf641e
parent  1ea6ec7f0d68357a23308c81d421117261e96af0 
removed old rubigen generators for merb-gen
jnicklas (author)
Fri Aug 08 00:36:42 -0700 2008
commit  1ea6ec7f0d68357a23308c81d421117261e96af0
tree    8f36ca45e10f486cbf4e332e1daa7efe4fb04952
parent  9ca55bc2cb3699644331e80b9e4049c89f099dd5 
using namespaced generator in merb-mailer
jnicklas (author)
Fri Aug 08 00:36:12 -0700 2008
commit  9ca55bc2cb3699644331e80b9e4049c89f099dd5
tree    99254d9b9f02c0d90cbbf74f6baf7e09e27f7fe4
parent  07ba43b928f0132473c9c09700174a8282e1717f 
moved templates to conform to new voncentions
jnicklas (author)
Fri Aug 08 00:32:14 -0700 2008
commit  07ba43b928f0132473c9c09700174a8282e1717f
tree    f22d1dabebbf227ea9cd9056baea1c0f22fb5860
parent  f6681ebe138afebdbb45e88cfa0d8399532f3771

08/07/08

Merge branch 'jnicklas_move'
michaelklishin (author)
Thu Aug 07 17:21:01 -0700 2008
commit  496851823daac87de7515ad0ff3431014054dec3
tree    5106d1e0ce0c7a50d3fb0becbb63a53b157e802f
parent  c97f75937fe155ea96d0c2288b2a779979f0220c parent  f6681ebe138afebdbb45e88cfa0d8399532f3771 
cleaned up after removal of orm specific generators, for clearer directory 
structure
jnicklas (author)
Thu Aug 07 14:33:26 -0700 2008
commit  f6681ebe138afebdbb45e88cfa0d8399532f3771
tree    ef78e832295045578967997281a70e577f5e1ae2
parent  83d584c4b5c1b635993c2a1a735d5269a1529538 
removed datamapper templates, they'll be in merb_datamapper
jnicklas (author)
Thu Aug 07 14:04:38 -0700 2008
commit  83d584c4b5c1b635993c2a1a735d5269a1529538
tree    cbf681b728f75bfd727f056c9dd92c7ccc25fafb
parent  10fa3af5f86ed884ed200b189705c5e5d37e792a 
moved sequel generators back into merb_sequel
jnicklas (author)
Thu Aug 07 13:57:49 -0700 2008
commit  10fa3af5f86ed884ed200b189705c5e5d37e792a
tree    2de4c3abbb1a0a837704fac170241c291a36db86
parent  5cad5f8d3c3baed6befa9fabf8a5915c77ea896a 
moved activerecord generators back into merb_activerecord
jnicklas (author)
Thu Aug 07 13:22:31 -0700 2008
commit  5cad5f8d3c3baed6befa9fabf8a5915c77ea896a
tree    3337621eb9a8f5511bf78772207b4ccff267f6e8
parent  0205b2d39c3b02047de7dfde28c988e22fd9bd00 
Fix a problem when Autotest in generated app did not run spec on change to 
helper file.
michaelklishin (author)
Thu Aug 07 00:17:43 -0700 2008
commit  c97f75937fe155ea96d0c2288b2a779979f0220c
tree    8a9310b212051543691e6cec022bc8a309fc8f47
parent  9c40b026693bacfc19eadbec347b0349488a40e2 
Merge branch 'jnicklas_merbgen_refactoring'
michaelklishin (author)
Thu Aug 07 00:04:18 -0700 2008
commit  9c40b026693bacfc19eadbec347b0349488a40e2
tree    57e97c9b8c4ad9c20bd1122851a96476538273dc
parent  cd4267ad7cde543d1308cc293cd7d1b1bb204ebf parent  0205b2d39c3b02047de7dfde28c988e22fd9bd00