5078b8bf11f23b1f4e42c701438c37c6140fd93e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9191176c4c189bb793688dcce1f6075182c6ecc0 9191176c4c189bb793688dcce1f6075182c6ecc0 2008-10-29T13:30:01-07:00 2008-10-29T13:27:37-07:00 Removes merb-core de52a19262c08e7dbd41ebb6d0c08a489f0c5732 Yehuda Katz wycats@gmail.com 2a14a81032c3df82930cacbc7e4b2dddd60aa31f Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/ad0a29856639e81465a691040008832ed023484d ad0a29856639e81465a691040008832ed023484d 2008-10-10T19:11:47-07:00 2008-10-10T19:11:47-07:00 Make checking for missing locals a little bit faster when rendering partials 8bce7e8e4df1a8952e80211f9c92c1d861afbbae Drew Colthorp colthorp@atomicobject.com 3ef9115ad5c332abdbc0f880e4d455259b649854 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/59c0379aac67576e470e06e8c0cece67d25cb491 59c0379aac67576e470e06e8c0cece67d25cb491 2008-10-05T19:23:20-07:00 2008-10-05T10:03:08-07:00 compile templates with preambles to assign locals, support recompiling partial templates if previously unseen locals are provided Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 91b044abb37fc095dcf5c65ca2dc931619b4efe0 Ezra Zygmuntowicz ez@engineyard.com 1cc54941b066ef3954c05197ff3368fa90aadf5b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/7f799f1196db3d7a2d95996cbf64eebce2b391cd 7f799f1196db3d7a2d95996cbf64eebce2b391cd 2008-09-18T17:39:29-07:00 2008-09-18T14:32:18-07:00 Document template_for. 469039d593e2ae937c2a72929c9dfcc61a01dcd7 Michael S. Klishin michael@novemberain.com 04d38da798cda4217dcd3b1b29c9043e873b6ad0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/dea5b6914daa668e01ded198281441796925a3d5 dea5b6914daa668e01ded198281441796925a3d5 2008-07-23T16:30:23-07:00 2008-07-23T16:30:23-07:00 another tiny tweak 4e7fc991608e3c910f79b960b97bc69d07b11e0a Yehuda Katz wycats@gmail.com 8a2940914437a47af60d927dfad427dc7594a5e5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a869557e886ed1aa35e9bd54882a7e03684629a9 a869557e886ed1aa35e9bd54882a7e03684629a9 2008-07-23T15:37:00-07:00 2008-07-23T15:37:00-07:00 Fixes open IO issue f6c6b8dce022c040c475ec9bffe62e022c744020 Yehuda Katz wycats@gmail.com 237c115c4a2be9f7e9b24de0224c494dbe6e6336 defdabd8df298863a2704d66c6d1054058a9d84f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/8a2940914437a47af60d927dfad427dc7594a5e5 8a2940914437a47af60d927dfad427dc7594a5e5 2008-07-21T13:44:15-07:00 2008-07-21T13:44:15-07:00 Resolved conflict. 7bc8693468dc29362facec77737f7398d97731e0 Yehuda Katz wycats@gmail.com c1b4cbcd1c85674551d4bc5fa068611a75e9a5de Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/237c115c4a2be9f7e9b24de0224c494dbe6e6336 237c115c4a2be9f7e9b24de0224c494dbe6e6336 2008-07-20T14:08:04-07:00 2008-07-20T14:08:04-07:00 Did I really commit that? 2bca145c1b1023250da9c91e57b037486ae852dc Yehuda Katz wycats@yehuda-katzs-macbook-pro.local bf37243fc8aa4eee1cc41f2504f3261f4dc03b46 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/047a5fe76be7525750b605364c02139f04505b27 047a5fe76be7525750b605364c02139f04505b27 2008-07-20T10:02:31-07:00 2008-07-20T10:02:31-07:00 Make sure default config has log level of error so template inlining bootloader won't dump everything to the tty. ce4a512ad69390be1b59d5cd991dea3ccb8de24f Michael S. Klishin michael@novemberain.com c019974cb103ca21722fe18c12872c50669a2ea3 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/509851b02f2bcb7936f3a122b499e69253280ce5 509851b02f2bcb7936f3a122b499e69253280ce5 2008-07-19T19:44:00-07:00 2008-07-19T19:44:00-07:00 Add support for argument capture and fix $DEBUG bootloader stuff [#390 state:resolved] b39ac3003c130aacf1eab8fa38d585fdc3f01e84 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local eeac765396194f17053de3ccb48db980e280a72d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/14449e2544b5db9ba201bb432925c83e5fa1e566 14449e2544b5db9ba201bb432925c83e5fa1e566 2008-06-23T16:56:27-07:00 2008-06-23T16:56:27-07:00 Let's try again, this time with <% end =%> f746e449ec54bf8439661265a510a698488a8cb1 Yehuda Katz wycats@gmail.com 6da13d27d602adf66862a0b0f2b74558f6d70bcc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/eeac765396194f17053de3ccb48db980e280a72d eeac765396194f17053de3ccb48db980e280a72d 2008-06-23T15:36:33-07:00 2008-06-23T15:36:33-07:00 Try #concat to resolve some issues. b8ebb5d9029e89359b8b9a0b2740cbf5f68d1a1b Yehuda Katz wycats@gmail.com e89d8f0d5e0f4f54f9c45900abc152aa2cec114c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/6da13d27d602adf66862a0b0f2b74558f6d70bcc 6da13d27d602adf66862a0b0f2b74558f6d70bcc 2008-06-23T14:34:13-07:00 2008-06-23T14:34:13-07:00 One more time. c15d15d8b90039deae3b7c0ae536785f0e180321 Yehuda Katz wycats@gmail.com 642314f13e3d03c894d6b17b0889babfd955ff99 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e89d8f0d5e0f4f54f9c45900abc152aa2cec114c e89d8f0d5e0f4f54f9c45900abc152aa2cec114c 2008-06-23T14:09:19-07:00 2008-06-23T14:09:19-07:00 Should handle denormalized multiline blocks now. d3f162c7abd2f22d78a630a65050b43b1e720820 Yehuda Katz wycats@gmail.com 1d41bd31d6acf8e02c07c089559893cd0c8188fb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/642314f13e3d03c894d6b17b0889babfd955ff99 642314f13e3d03c894d6b17b0889babfd955ff99 2008-06-23T13:13:05-07:00 2008-06-23T13:13:05-07:00 wycats needs to learn to escape pipes. ba9b5770491e5e1a557b8247e201f63b9ec6e599 Yehuda Katz wycats@gmail.com 0e44eca7bd69e325b687d2174f054ece61910ad0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7043503871759eadc947bc5138ebbc96b8e17d74 7043503871759eadc947bc5138ebbc96b8e17d74 2008-06-22T18:37:13-07:00 2008-06-22T18:37:13-07:00 <%= now takes a block in Erubis. Erubis buffer now an ivar (@_erb_buf) so eval is no longer required for capture. Helpers that take a block should now return a string. 28d5d1835e98962007a98e671ae73df979014a2a Yehuda Katz wycats@gmail.com 10020f168802d9a613501d650f1db1b94c2abb27 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ce9182e196832a2e1fc293f2f3c1f3357d74e3c6 ce9182e196832a2e1fc293f2f3c1f3357d74e3c6 2008-06-18T16:43:29-07:00 2008-06-18T16:43:29-07:00 Add support for non-standard template reloading. Plugin authors need to override load_template_io to handle special reloading logic. 015fb08cf6a43ba76631f4b830f717fd3a550ebe Yehuda Katz wycats@gmail.com 282a83a7e48467f27558222f44bfa4ec94db2399 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/191f5c8a8ea334dd465968d796d7a598fecc5545 191f5c8a8ea334dd465968d796d7a598fecc5545 2008-06-18T16:19:26-07:00 2008-06-18T16:19:26-07:00 Add support for IO templates instead of just paths. See PLUGIN_API_CHANGELOG for details. 3abba2285bc766a461d271ded533d3b3e14d9bdc Yehuda Katz wycats@gmail.com d982d80f32fd83b24c64b11bfcd6ccda69e1a8a5 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/c58ed2fd68b6e4120ea68f92696d64d8778d98d7 c58ed2fd68b6e4120ea68f92696d64d8778d98d7 2008-05-25T02:38:33-07:00 2008-05-25T02:38:33-07:00 Added Merb::Template.template_extensions as a semi-public method for getting known template extensions 33860be140b9cb9a51c21b86d345c21d6653d117 Fabien Franzen info@atelierfabien.be faa4670ebc2b3e3f690a15f059eae4b0bccd6b1a Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/8f606ac9a2c42db29ef03492da5fc88d8c8af61b 8f606ac9a2c42db29ef03492da5fc88d8c8af61b 2008-04-27T04:40:19-07:00 2008-04-27T04:36:50-07:00 Use Notes instead of Note everywhere in docs. b76c94d68459fbba41ac4ffecd8655ddd3b91147 Michael S. Klishin michael@novemberain.com 142d85ca7cf7c7a4f5a93b09be12978b39059125 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/312181aade867323834c5031b7e9707f931e9ded 312181aade867323834c5031b7e9707f931e9ded 2008-03-23T15:07:39-07:00 2008-03-23T15:07:39-07:00 remove Kernel#requires it wasn't being used. get erubis compiled methods to take a locals={} hash in prep for hash as locals. 6280af600d4c35194850e2d3476d431de40c1d54 Ezra Zygmuntowicz ez@engineyard.com c5048dd27a6c50d1b3c4c779cf8a9b84b592ab9c Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/9a59da73e62bfc0c20ca7e87292a83b07771356b 9a59da73e62bfc0c20ca7e87292a83b07771356b 2008-02-28T11:21:02-08:00 2008-02-27T23:40:44-08:00 Documentation standards changes Overhauled the method documentation to match the emerging documentation standards in #161. Signed-off-by: Yehuda Katz <wycats@gmail.com> 14489eecc6c5253947532a39a5182e1acd7ae1a9 Yehuda Katz wycats@gmail.com 061a2d0832285d01a5e716a1a56524f18fc296ba Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/4cd91a55473b050c13ce0a5acef28f8048861144 4cd91a55473b050c13ce0a5acef28f8048861144 2008-02-26T00:06:07-08:00 2008-02-25T21:07:10-08:00 Documentation cleanup Cleaned up and complemented documentation for Merb core, Config, Controller and Test::RequestHelper. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 8033cbde531bd10c918d76679be6b4c622398db3 Ezra Zygmuntowicz ez@engineyard.com 5af0951d43c1b5736fce1ba81d7e5add46dd0448 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/1272b0802b67a64d4645c2009abc215b975eb892 1272b0802b67a64d4645c2009abc215b975eb892 2008-02-23T23:53:47-08:00 2008-02-23T20:11:52-08:00 Documentation tweaks Cleaned up and elaborated on the documentation for AbstractController, Template and RequestHandler. Marked some missing documentation with DOC. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 59e3e742830422ccea7ad4834c9d356b359ee7d7 Ezra Zygmuntowicz ez@engineyard.com a952c9895541975ee64689782f9a6023e9416f28 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/3d023b06e4da0bfc9edbb28ee92fd2bec762b31a 3d023b06e4da0bfc9edbb28ee92fd2bec762b31a 2008-02-18T19:19:26-08:00 2008-02-18T19:19:26-08:00 Fixes for capture/concat 6249c26c22c40bbe8dc6953e55d7382a290622ec Yehuda Katz wycats@gmail.com 6f0f04323a467913ce9490dbdebc3c7497f4d18f Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/70a25a7825f637ca810f93e4367ed618f46cb4fe 70a25a7825f637ca810f93e4367ed618f46cb4fe 2008-02-17T00:23:04-08:00 2008-02-17T00:23:04-08:00 Move params_to_query_string from Responder to Request where it belongs 3806c922562f7aa315b5575e6b2aff0541b50ff5 Ezra Zygmuntowicz ez@engineyard.com ecf2c43de74354a441b9fe4030f4969354a87c3f cd3b7127461dd8dcd19a801f412f926daf2d2848 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/7fa86b68c7f467c5994b6879a8197fdaf1caec58 7fa86b68c7f467c5994b6879a8197fdaf1caec58 2008-02-14T09:17:37-08:00 2008-02-14T09:10:39-08:00 Merge branch 'eval' of git://github.com/technicalpickles/merb-core 3ce3a7070710976376f2d00db76964c188877270 Michael D. Ivey ivey@gweezlebur.com d2c44ce888d7c85caa41b7e0e9df816f87f1bdce Josh Nichols josh@technicalpickles.com http://github.com/wycats/merb-core/commit/cd3b7127461dd8dcd19a801f412f926daf2d2848 cd3b7127461dd8dcd19a801f412f926daf2d2848 2008-02-13T19:15:12-08:00 2008-02-13T19:15:12-08:00 Added file and line info whenever possible. 22284073b9ea2a4b849660a5f386520fb175a158 Josh Nichols josh@technicalpickles.com dc83419bf5f16e3f58e2fe9fc7bbcfd7b71bbc0f Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/f30da42347fb8547f4514f9970f05604790b95b5 f30da42347fb8547f4514f9970f05604790b95b5 2008-02-12T20:20:24-08:00 2008-02-12T20:15:46-08:00 Remove DOC annotations and funky formatting, meh 618c006fa3d5183fa19b8eaf4ebd89c3222f8e7d Michael D. Ivey ivey@gweezlebur.com 9b1cf4622132cb43d0a831d33cafd612fb9a2244 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/4a1bf73ea2c7eae787a47d6327c8d56b84468324 4a1bf73ea2c7eae787a47d6327c8d56b84468324 2008-02-05T20:23:24-08:00 2008-02-05T20:23:24-08:00 Spec fix fab3e050a18c179d1122366b970b32be8bb489d3 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 7ac709cdd9dfb762a4c85a7e75e287ed25442a02 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/8912aba717f66a113aa97a6a772a7b5f7d193e34 8912aba717f66a113aa97a6a772a7b5f7d193e34 2008-02-05T13:41:08-08:00 2008-02-05T13:41:08-08:00 Adds new paths and makes render work in dev mode. b94c23c0313dffd04781bce373a4296d4d5cd34f Yehuda Katz wycats@yehuda-katzs-macbook-pro.local d05e3e9b17ff36f7cff2169ac9f0fd7110a535a3 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/759f91df868e658b90e969e167d2d82757147e3d 759f91df868e658b90e969e167d2d82757147e3d 2008-02-02T14:51:15-08:00 2008-02-02T14:51:15-08:00 Support reloading of templates e33edaef6f744a4815dd47b793eaf8d4c9c4f6f7 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 2b5b48d5b9236d35663be569f73af7d4cb309891 4e63cbe2430c36dc3910cf42471cb0be314b1e2b Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/4df06b5e13c296698155d27c4331af0d1d5036d7 4df06b5e13c296698155d27c4331af0d1d5036d7 2008-02-02T06:03:32-08:00 2008-02-02T06:03:32-08:00 Merge branch 'master' of git@github.com:wycats/merb-core cfe5333ef29e9176cbcd3de1958edd09a0bce1ee Yehuda Katz wycats@yehuda-katzs-macbook-pro.local cc9228bf2ed6e5e0be0399cde1bfe508cd9a1f2c Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/2b5b48d5b9236d35663be569f73af7d4cb309891 2b5b48d5b9236d35663be569f73af7d4cb309891 2008-02-02T06:03:27-08:00 2008-02-02T06:03:27-08:00 support :layout => false and stop throwing for template not found d21bdc0a53c282fea949817689b2cdd19e9b6e4b Yehuda Katz wycats@yehuda-katzs-macbook-pro.local b28ba4130fc0c47b11c250fd7fa01501b0d6d827 Hampton Catlin hcatlin@greed.local http://github.com/wycats/merb-core/commit/ba18610c5796fe3f34ed9f1e415c3b1f5092cd1f ba18610c5796fe3f34ed9f1e415c3b1f5092cd1f 2008-02-01T12:03:37-08:00 2008-02-01T12:03:37-08:00 DOC annotations applied 0e35f0d42dbff29f3ffe239e67aeb1469ab1ee86 Hampton Catlin hcatlin@greed.local