benburkert / merb-core fork watch download tarball
public
Fork of wycats/merb-core
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/benburkert/merb-core.git
merb-core / Commit History feed

06/11/08

Merge branch 'master' of git://github.com/wycats/merb-core
djwonk (author)
Wed Jun 11 10:52:54 -0700 2008
commit  75f71027c5f023eebb91023845f06262cb16a880
tree    cc4fa07242559e1e20f49ba4422e51a48626916f
parent  3e8a8934b62aaa5453a97b8150b0ab3877580e0c parent  cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15

06/10/08

siiiiiigh.
wycats (author)
Tue Jun 10 22:10:21 -0700 2008
commit  cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15
tree    54b19a7e19801348f42fa9d863038d13222b21e6
parent  ce9a7f1e77fcb633db0f936467a77d2fdf687437 
Revert partial counter and yielding.
wycats (author)
Tue Jun 10 21:58:45 -0700 2008
commit  ce9a7f1e77fcb633db0f936467a77d2fdf687437
tree    f73adff0bffce1cdbe493a99ca4ecba9b685889e
parent  a09128eac56b9333324692a2ddf2be688c33de85 
Remove some duplication
wycats (author)
Tue Jun 10 21:54:56 -0700 2008
commit  a09128eac56b9333324692a2ddf2be688c33de85
tree    73ea997b0e8ac0a45b80ea2778fb255a830e8290
parent  384287b21dc6fdac927b088c2aa6647e461532b9 
For crying out loud.
wycats (author)
Tue Jun 10 21:39:58 -0700 2008
commit  384287b21dc6fdac927b088c2aa6647e461532b9
tree    052ad67ac570ff30bae7d353e73cf317912d8e15
parent  995f4f670e8a212af676bd9736f1a2c4b4cb2161 
Refactor display. WARNING: This commit might not be stable. I need to add 
a bunch more specs for display before I feel confident.
wycats (author)
Tue Jun 10 20:28:48 -0700 2008
commit  995f4f670e8a212af676bd9736f1a2c4b4cb2161
tree    72e1a7b41f8b65628961169b663856a80b2cffc8
parent  c1ce863d84641e1748a388a959fd409b7c244916 
Make the TemplateNotFound error read better. Slight refactor of 
_get_layout.
wycats (author)
Tue Jun 10 19:52:40 -0700 2008
commit  c1ce863d84641e1748a388a959fd409b7c244916
tree    7c90070b6e7335f2c0917a61703a680ad3a1a792
parent  85bea5d84311e6dcf642180683bfaf53a5c27402 
Fix _template_for so it's actually readable
wycats (author)
Tue Jun 10 19:30:07 -0700 2008
commit  85bea5d84311e6dcf642180683bfaf53a5c27402
tree    436f302eb5a66db6025e6adb2a58ccf6c60b41de
parent  0e36b591f46eaecdba168f03b36b87388eb5cfa3 
uhhhhhhhh...
wycats (author)
Tue Jun 10 17:00:27 -0700 2008
commit  0e36b591f46eaecdba168f03b36b87388eb5cfa3
tree    90fc8765e50963e7ac4d7d0c6e8064b30a16fe5c
parent  e8c05531659c45f918f17b7627886bf3e9a40556

06/09/08

Added Merb::Router.reset! and Merb::Router.capture
fabien (author)
Mon Jun 09 01:40:33 -0700 2008
commit  e8c05531659c45f918f17b7627886bf3e9a40556
tree    58d06c4e3d2611057804ffea0fb3562a38d8057b
parent  74d24639f8d7158d4b5ba2457596fbc3dad90c56

06/08/08

Speedup Route URL generation
ivey (author)
Sun Jun 08 11:53:57 -0700 2008
commit  74d24639f8d7158d4b5ba2457596fbc3dad90c56
tree    e132be36c1d0840cec104d9ffc521c50d8d34b34
parent  3e987bed134802163340ee7da750076d969ee887 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Sun Jun 08 11:35:27 -0700 2008
commit  3e987bed134802163340ee7da750076d969ee887
tree    c44940718baa6ad283e9ae59efbb7c80712099fb
parent  b80e5fe892b44569159a33ac87b2a2b70f45e24b parent  d5d3c349d4ea30cffd268a6b2bb6ddcb1589ed83 
Start work on fixing contaminated cousins bug.
wycats (author)
Sun Jun 08 11:35:19 -0700 2008
commit  b80e5fe892b44569159a33ac87b2a2b70f45e24b
tree    3fffe49e7d958809b7b8a2d316e86adc3d679fb2
parent  9e62f4197a42c80d49d42a75730cb24c60364c9a 
Changed controller inheritance of _template_root
fabien (author)
Sun Jun 08 07:42:08 -0700 2008
commit  d5d3c349d4ea30cffd268a6b2bb6ddcb1589ed83
tree    61d3ccdf75892c68bd3d08b5b0c1b36604ecdd58
parent  f5c19f588f9e7d354aa3bfda01816cfa503868df 
Added the ability to use full/absolute template paths for render, display 
and partial views
fabien (author)
Sun Jun 08 04:28:36 -0700 2008
commit  f5c19f588f9e7d354aa3bfda01816cfa503868df
tree    22d933db6a690a9998a7239603991241fe1bee77
parent  9e62f4197a42c80d49d42a75730cb24c60364c9a

06/05/08

This cannot be tested this way. It needs to be tested as a public spec 
(testing it privately here was a cop-out and fails when I fixed up the way 
dependency works).
wycats (author)
Thu Jun 05 19:14:42 -0700 2008
commit  9e62f4197a42c80d49d42a75730cb24c60364c9a
tree    2abed221d9fe004343be629b0c61fd61bb90dd50
parent  30d55e9bcf10d3d396b2887b72803e9dd02e0765 
Allows passage of query string via env["QUERY_STRING"] in tests. [#358 
state:resolved]
wycats (author)
Thu Jun 05 17:26:46 -0700 2008
commit  30d55e9bcf10d3d396b2887b72803e9dd02e0765
tree    97a6e90349197dcd5e858b534f4b916efe6836c5
parent  29b9b1c84b558c870896431db7688c943760e20e 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Thu Jun 05 17:10:45 -0700 2008
commit  29b9b1c84b558c870896431db7688c943760e20e
tree    771ebe76128bd1b6b4affa50713e0cef34621927
parent  4d6aeea5b3751b7db0aead50369e32a3847a65bf parent  b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4 
Handles use of dependency after BootLoading. [#360 state:resolved]
wycats (author)
Thu Jun 05 17:10:35 -0700 2008
commit  4d6aeea5b3751b7db0aead50369e32a3847a65bf
tree    3b9d41885b575028d30c8875529519a2774c54fd
parent  5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43

06/04/08

properly set the session_id_key
michaeldauria (author)
Tue Jun 03 18:56:24 -0700 2008
ezmobius (committer)
Wed Jun 04 20:41:29 -0700 2008
commit  b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4
tree    02f46c47eb23e5ef024ae70cc116f228f07c00f3
parent  ebf1531725a1fe078a9d85a23d84129d3b95bb01 
added 2 specs for multipart formdata: (1) for checking request with IO, 
(2) for testing GET with content_type not erroring on multipart/form-data 
absence; fixed error with multipart/form-data absence.
paulboone (author)
Tue Jun 03 15:55:09 -0700 2008
ezmobius (committer)
Wed Jun 04 20:35:13 -0700 2008
commit  ebf1531725a1fe078a9d85a23d84129d3b95bb01
tree    ef39cfabee595c8623efee40f09698d31efec05b
parent  5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43

06/02/08

Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Mon Jun 02 23:30:10 -0700 2008
commit  5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43
tree    cc841a26c41dae874ef1962f9a7f0bdd19a09e72
parent  15ea15f954cc915349f501e7f240fbe24d6b54b8 parent  132b469322456c3dd918a1daaaf5046acd65c309 
Made Class a lot more sane.
wycats (author)
Mon Jun 02 23:29:58 -0700 2008
commit  15ea15f954cc915349f501e7f240fbe24d6b54b8
tree    5bad842fade6a514174a9581009bd9d7b4c86ec0
parent  0f6704030f272f3b242d5b21c619ecc56bcee8d6 
Merge branch 'master' of git@github.com:wycats/merb-core
ivey (author)
Mon Jun 02 22:38:28 -0700 2008
commit  132b469322456c3dd918a1daaaf5046acd65c309
tree    e69ef49916c63909b353b7cc9f84f7ee93ad8eaa
parent  adc1922f7199fc721141cb54550248ca928371ad parent  0f6704030f272f3b242d5b21c619ecc56bcee8d6 
Fix README for merb-gen app foo
ivey (author)
Mon Jun 02 22:37:48 -0700 2008
commit  adc1922f7199fc721141cb54550248ca928371ad
tree    4988fadc7a4a9c4d088d6f7d8244c9120ab7e72b
parent  d9ab75d1528d1b7d1395ac9293086c7141044e06 
Do not duplicate work Merb::Template.template_extensions does in Templates 
bootloader.
michaelklishin (author)
Mon Jun 02 02:08:40 -0700 2008
commit  0f6704030f272f3b242d5b21c619ecc56bcee8d6
tree    bd6d12f4e2f2287497ca0456087342b2a46a30c2
parent  dff256a6d0ea79acbcd8a95fc3676e27defec2b5 
Make exception message when Merb cannot find template explain what it was
michaelklishin (author)
Mon Jun 02 02:06:23 -0700 2008
commit  dff256a6d0ea79acbcd8a95fc3676e27defec2b5
tree    bcca6d7b8008edbb1a4f40f09cf59002e47d55f2
parent  e1619deca5caa7b1d90ab4abfd8f4db7620da537

06/01/08

Merge branch 'patches'
michaelklishin (author)
Sun Jun 01 23:39:57 -0700 2008
commit  e1619deca5caa7b1d90ab4abfd8f4db7620da537
tree    ebe2692a8cd86d529abb5a6e08d67951ade14590
parent  815ba9785955942596f5f3db378f60e42ecc29cd parent  2d452bf4731f398c54d98b0a364f2a64c98fc7f8 
Fixed 2 problems with multipart form upload after application is deployed 
to Tomcat via warble: (1) The @body object in this environment is an IO 
object, not a StringIO, so doesn't have a size method, and (2) 'tempfile' 
needs to be explicitly required.
paulboone (author)
Sat May 31 08:22:07 -0700 2008
michaelklishin (committer)
Sun Jun 01 23:38:13 -0700 2008
commit  815ba9785955942596f5f3db378f60e42ecc29cd
tree    c3b75b559f54479b4cdc7a640feddebfbd6c8845
parent  34b0ccb9db639ed27e6f1158eb712e0c2a8e234c 
made only and except uglier and faster
granth (author)
Thu May 29 17:46:44 -0700 2008
michaelklishin (committer)
Sun Jun 01 23:24:49 -0700 2008
commit  34b0ccb9db639ed27e6f1158eb712e0c2a8e234c
tree    d3146cb4df6701b93918ee238e8ade9cff18af1a
parent  a70ee65be080740f0f0cbdb08ebfc608596004c6