93fa05d7bf0c686488ea60b5b84b29f9d905d463 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/20b96c7f455b54429052e1ba7a5e2e1139adfe6e 20b96c7f455b54429052e1ba7a5e2e1139adfe6e 2009-10-20T22:13:55-07:00 2009-10-16T15:09:33-07:00 [merb-assets] Fixed external asset urls when path_prefix is set Added checks for relative, absolute, and external urls for when path_prefix is set in Merb::Config. path_prefix should be ignored when an external url is requested, however it should be used when absolute or relative urls are passed. [#614 state:resolved] e7bc7ecdffcae267867c6586178d855c96134017 snusnu gamsnjaga@gmail.com 4669b5283fd31efb2afff67252ceeb110188d7fc Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/93fa05d7bf0c686488ea60b5b84b29f9d905d463 93fa05d7bf0c686488ea60b5b84b29f9d905d463 2009-10-20T21:40:13-07:00 2009-10-16T14:38:22-07:00 [merb-assets] Fixing :reload option on asset helpers Fixed :reload => false so it no longer defaults to Merb::Config[:reload_templates] when explicitly set. This was causing problems if you want to specifically overwrite the behavior of writing random strings (which can break urls, especially for external resources). 30adb40303b472824472bbc5b13aa23f85927cbd snusnu gamsnjaga@gmail.com 701678687e10a5f281ed33f9aa9ccfad390e42cb snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/388ecab23f4667e7161fc1598c16875fb4c9c7d8 388ecab23f4667e7161fc1598c16875fb4c9c7d8 2009-10-04T13:14:57-07:00 2009-10-01T19:06:52-07:00 Changed plugin dependencies to "~> #{Merb::VERSION}" ca00b9913318290187f589b996db64009b269518 snusnu gamsnjaga@gmail.com 8a06f99d60affb73b7d1b6d690aea03f18e45e56 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/701678687e10a5f281ed33f9aa9ccfad390e42cb 701678687e10a5f281ed33f9aa9ccfad390e42cb 2009-10-04T13:14:57-07:00 2009-10-02T08:43:43-07:00 [merb-assets] Don't rely on hash ordering in specs rake spec in the toplevel merb directory now passes all specs. Also, merb-core/rake specs:oneoh passes 4e8f1e6c62d2cbd13fb4943cdfa7e16940005f4e snusnu gamsnjaga@gmail.com 5ee0e351613182dda76fd42a10ce0b51be782bbc Julien Langlois langlois.jf.dev@gmail.com http://github.com/wycats/merb/commit/07139981ef5e719423a96e4c4663124e5a8b5ae0 07139981ef5e719423a96e4c4663124e5a8b5ae0 2009-09-27T16:37:58-07:00 2009-09-27T16:37:43-07:00 [merb-assets] Refactored auto_link to support new behavior Separates loading CSS from javascript and reuses other asset helpers for it's internal implementation instead of using hardcoded paths. 2a05582e03d0109154a983c5091782c47fcee245 snusnu gamsnjaga@gmail.com 747fe663517660e642752ea919026d636c469f49 Kristofer Goss krsgoss@gmail.com http://github.com/wycats/merb/commit/8249ec58bd34eea943bb86c277dde9a316eec186 8249ec58bd34eea943bb86c277dde9a316eec186 2009-09-26T21:36:43-07:00 2009-09-26T21:33:26-07:00 [merb-assets] Made uniq_path helpers work in a localhost based env By setting the domain, and excluding the asset sub-domain option, it will just generate normal URL's so that the views will work the same regardless of the setup. [#1263 state:resolved] fa1e09343599a76f6ac09852310c4b86b43d0cf3 snusnu gamsnjaga@gmail.com 3812775bb86612f660154ccf37e501f7484a2c76 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/30df9ac821c5fac77210b30de1b39afea1845dc3 30df9ac821c5fac77210b30de1b39afea1845dc3 2009-04-18T14:37:51-07:00 2009-04-18T14:37:51-07:00 Fixing asset spec so its not dependent on hash key ordering f476d45b90e8f24b0358b03efdac0d437de53152 Jacques Crocker merbjedi@gmail.com 77d0aa50c08cdb4d54aedb14268315a26cb4380a Jacques Crocker jcnetdev@gmail.com http://github.com/wycats/merb/commit/60446ac98cac21aed2bad71f5b5daa33827d67d1 60446ac98cac21aed2bad71f5b5daa33827d67d1 2009-03-18T22:07:03-07:00 2009-03-18T22:07:03-07:00 image_tag should not raise an error when image is nil or empty string (Lighthouse #1243) 8ca22cca909e7306d9f93158f6855bfca7a1bb60 Jacques Crocker jcnetdev@gmail.com 2d6378613ea4246d3f0c8c46a08e0a26f7c6b4e6 maiha maiha@wota.jp http://github.com/wycats/merb/commit/e022c862d83627f0cee6f90eda6c694587d153b5 e022c862d83627f0cee6f90eda6c694587d153b5 2009-03-10T02:21:09-07:00 2009-02-27T17:20:32-08:00 remove useless 'collect' method 730b073db94e9fa79222316dedaf060a866fc4d7 Matt Aimonetti mattaimonetti@gmail.com 65a6e7f0a14ccfb1cad8f5d3f0940911e442b914 Cory ODaniel github@coryodaniel.com http://github.com/wycats/merb/commit/9226ab290ff9ddf70aff0296b80960c5c47ecc93 9226ab290ff9ddf70aff0296b80960c5c47ecc93 2009-02-25T10:35:00-08:00 2009-02-23T20:19:18-08:00 added prefix and suffix options for js_include_tag and css_include tag. Also defaults are available in Merb::Plugins.config or set on a case by case basis in js_include_tag or css_include_tag These are good for versioning js/css file file names (to force updates) and for hosting statics on anotehr domain like cdn.example.com 2468b0179f6b429d9a4e3638398851e99e20a073 Matt Aimonetti mattaimonetti@gmail.com 9b7bbedb2e88732bf83ef3f0273d5e01a5845ec5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/8b2b7a67d2aea2220e842066d497448d729568b6 8b2b7a67d2aea2220e842066d497448d729568b6 2008-10-31T16:57:25-07:00 2008-10-31T16:56:30-07:00 Modify the rakefiles to be DRY 882ca317ec851cd8e9570ef2da67fea646c1e29d Yehuda Katz wycats@gmail.com 8b81364e92fac79009aa2c352c86c099cc00dd35 michael.s.klishin@gmail.com michael.s.klishin@gmail.com http://github.com/wycats/merb/commit/c364cdf3af58f9aca4b608a5d2897067025cb0d2 c364cdf3af58f9aca4b608a5d2897067025cb0d2 2008-10-16T01:34:47-07:00 2008-10-14T11:00:04-07:00 Use Merb::VERSION in Rakefiles. Extract versions in dependencies.rb into methods on the generator. 23786ef2a4147479ecafa735626e4c85727a6aea Carl Lerche carllerche@mac.com 4e96612276ac8e81906854269a8b147f6bd66936 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/79ec9769a042694755ab8663ee8e5caad26ce933 79ec9769a042694755ab8663ee8e5caad26ce933 2008-10-13T15:28:41-07:00 2008-10-13T15:28:41-07:00 Bump up versions e81b5b57f7ea032f94778e9dad87006457c5cbed Michael S. Klishin michael@novemberain.com 0ae3b0c28db7d0853eabb25a53038b8afdf1c970 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/4e96612276ac8e81906854269a8b147f6bd66936 4e96612276ac8e81906854269a8b147f6bd66936 2008-10-13T15:26:07-07:00 2008-10-13T15:26:07-07:00 Tweaked rake tasks after release. Updated Contributors file. 61107979712bbeaf4b5a66d7106d4f47280b7540 Michael S. Klishin michael@novemberain.com e928ed98867450c1cbec5808e2856df660ad4263 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb/commit/de81f3dcb662cbcf06de75bdbd27f554050d9ac9 de81f3dcb662cbcf06de75bdbd27f554050d9ac9 2008-10-13T03:23:22-07:00 2008-10-13T03:23:22-07:00 Fixes typo in merb-assets rakefile :( 7642addc722ae642ffb1636e47d14cecbf78d57a Daniel Neighman has.sox@gmail.com 24c48d0195070faba313767e6a486f37fc59f9f8 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb/commit/28386676609a729c54c55fb47c42803a08a9449a 28386676609a729c54c55fb47c42803a08a9449a 2008-10-13T03:13:28-07:00 2008-10-13T01:52:39-07:00 Updates the versions to a new file bf7d0a0980fc2b8d11dcb5d32d7a00ddbdd6049e Daniel Neighman has.sox@gmail.com b3251075f8cb57f4ee1c3ee187e8e4c9cb10ab2b Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/936cf4b9f13beb016ea84efd81447f2d5d80a370 936cf4b9f13beb016ea84efd81447f2d5d80a370 2008-10-07T12:36:40-07:00 2008-10-07T12:36:40-07:00 Fixed proper querystring handling. Thanks Felix. fcbdef582f9cba111577881e088209d60a174eb7 Fabien Franzen info@atelierfabien.be 32daa3187922656b2aba787159c81a90c2fb654a Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/f7a3b547fb38157ed24b5f97f43bf79fa638b1e6 f7a3b547fb38157ed24b5f97f43bf79fa638b1e6 2008-10-07T05:06:22-07:00 2008-10-06T14:17:36-07:00 Bump up versions 0e20d1660a9a0a847c66eaad0505591c170f7ca5 Michael S. Klishin michael@novemberain.com e51a805ef4fbde2df0996bf18a3eb0571397d476 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/5e90dcc3622baab6a7eb3b51e9f47fd454e8bfac 5e90dcc3622baab6a7eb3b51e9f47fd454e8bfac 2008-10-02T06:07:48-07:00 2008-10-02T06:07:48-07:00 If Merb.env?(:test) we don't need ugly = true spread all over the place f1e56727bc752590572e37b45914df40f53707d9 Fabien Franzen info@atelierfabien.be ec5dcaa11b0ae2c49fe7b6c2c43261b11326bac0 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/be8c1a3235637a4ed2cf8d7f2d4ada31a68a056c be8c1a3235637a4ed2cf8d7f2d4ada31a68a056c 2008-09-28T07:09:19-07:00 2008-09-28T07:09:19-07:00 Better Rakefile spec runner; more merb-slices specs f8f0ba2587930fb67bd602fa370797cf8d4a80d3 Fabien Franzen info@atelierfabien.be df52ace974dc7ca43f61c80a1126dd37a5b3b2fb Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/8fe2632084f20d82cbc8360dee35440b0cd8b18a 8fe2632084f20d82cbc8360dee35440b0cd8b18a 2008-09-27T06:19:49-07:00 2008-09-27T06:19:49-07:00 Yes, details count bac62a48b25733e6b21057d13a7dc79c27da4f7d Fabien Franzen info@atelierfabien.be 054fa2eda30a9675abf7d57d32c130535b63d2ec Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/1a9f56297608b9f8013e9f00c5986964d04abee1 1a9f56297608b9f8013e9f00c5986964d04abee1 2008-09-26T12:30:17-07:00 2008-09-26T12:30:17-07:00 Re-added :gemspec task to all Rakefiles 94a720365341dc1402dc053c42776bdc0c27dc3c Fabien Franzen info@atelierfabien.be 7392da403acf7f470266bd732f35eefd519203c3 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/8b4388e20e2e6e02ca04438b3919adf0ed36cc81 8b4388e20e2e6e02ca04438b3919adf0ed36cc81 2008-09-26T06:27:12-07:00 2008-09-26T06:27:12-07:00 Updated Rakefiles to use Merb::RakeHelper from -core a5625c584b5fd0dde2dea468982a5bcfa9cc7136 Fabien Franzen info@atelierfabien.be f76d1bebfbf5c61425370d15c8f2575537c66e2e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/87d9b9c47cbd05d3b57b55c8c43757a570162fd8 87d9b9c47cbd05d3b57b55c8c43757a570162fd8 2008-09-24T13:55:17-07:00 2008-09-24T13:55:17-07:00 AbstractAssetBundler now uses absolute file paths ea15cf2873a94be21edcf58dd44505adda11856e Fabien Franzen info@atelierfabien.be edb09b83faec5f7fa1d26906ff3305026f5d8373 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/f76d1bebfbf5c61425370d15c8f2575537c66e2e f76d1bebfbf5c61425370d15c8f2575537c66e2e 2008-09-24T13:43:17-07:00 2008-09-24T13:43:17-07:00 Added :random option to image_tag as well 7d2357b456941bba29551da3fbeb3c049d52d7a8 Fabien Franzen info@atelierfabien.be f1ec1d2fc895bd440f702703b479e3e97244f354 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/edb09b83faec5f7fa1d26906ff3305026f5d8373 edb09b83faec5f7fa1d26906ff3305026f5d8373 2008-09-24T13:39:06-07:00 2008-09-24T13:39:06-07:00 Added :random option (with fallback to Merb::Config[:reload_templates]) to prevent caching of assets a4a7bc5e9c3aba9aa6beb75654862c6f730a7583 Fabien Franzen info@atelierfabien.be ab3c6e5c69463ae08d19f665169849435fb0f767 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/493e22d2106882191df9b692ca98fa947a424981 493e22d2106882191df9b692ca98fa947a424981 2008-09-22T22:30:22-07:00 2008-09-22T22:30:03-07:00 Fix license files in merb-more. 5b59832f309530440ee68f4d2e5a37c336d50298 Michael S. Klishin michael@novemberain.com 08870f0ca0fd4419b169556c95492906e7537419 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/e428cdb7d198cb3d84babe68a8f4101fc3d667c8 e428cdb7d198cb3d84babe68a8f4101fc3d667c8 2008-09-17T15:31:14-07:00 2008-09-17T15:31:14-07:00 Make everything in -more respond to rake spec. Test all the f...ng time! 48060f5c83ec03862ecc82635887b04da893ae32 Michael S. Klishin michael@novemberain.com 340520f683fc8a5d4232e043286edfc92dee2dec Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/750e2f083bce36f90639dac2e95b2ff4f56181e6 750e2f083bce36f90639dac2e95b2ff4f56181e6 2008-09-13T15:06:37-07:00 2008-09-13T15:06:37-07:00 Bump up versions. 0d190ac0e01d0594821c2aec7c5badbe50114ba3 Michael S. Klishin michael@novemberain.com 745386a9b46faaa1e56c5c19b9387b3b9b3fa61f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/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 78ff55f27c363988fa783295c95fda566dd9a03e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/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 25c70d19493a80532626c3b7b3c1b396fbeb5f19 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/192390d620b6ee1301f09957f174ea4b080c1339 192390d620b6ee1301f09957f174ea4b080c1339 2008-08-25T14:57:43-07:00 2008-08-25T14:57:43-07:00 Bump up versions. 3c1e33ba0fc54988d2e60bcc9b1d76176de25506 Michael S. Klishin michael@novemberain.com e9f309ede5289fc80b6ac04e28cd8727f1a63677 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/6bbf3157e60d009d7821ff4ef0f595cff5c8f309 6bbf3157e60d009d7821ff4ef0f595cff5c8f309 2008-08-12T21:05:51-07:00 2008-08-12T21:05:51-07:00 Bump up versions. 17162109d84843555634eb85a60a64f55bb7fa38 Michael S. Klishin michael@novemberain.com ee3ea15aa42e5ef06e4ef10c2e4f307f620487a6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/fdbb279b5ac0ce856e866a3b09444fdbfbdcb525 fdbb279b5ac0ce856e866a3b09444fdbfbdcb525 2008-08-03T11:26:38-07:00 2008-08-03T11:26:38-07:00 Merged in merb-gen autodiscovery branch. Squashed commit of the following: commit 8881d2971a9bcacb01f2c1739f6f8a3c576c8833 Author: Michael S. Klishin <michael@novemberain.com> Date: Sun Aug 3 21:23:59 2008 +0300 Do not require Rubigen since we no longer use it. commit 79e1999b1b8fae9e4ecb30336082d46474ed709d Author: Michael S. Klishin <michael@novemberain.com> Date: Sun Aug 3 21:23:19 2008 +0300 Update to merb-assets spec task. commit 220fc1f6f6f563339d1a1fc78ca1bd1a7ac9be4e Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 2 19:08:55 2008 +0200 updated templater dependecy version commit 1e5135f77a120f417a5d750abbd80ee5c18cf2d8 Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 2 19:06:47 2008 +0200 updated README for merb-gen commit 5c6957476efb1363c381f74c06aff06a1cc57410 Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 2 19:04:45 2008 +0200 using Merb.add_generators in merb-slices Generators file commit 1a01fd1ed7b470941f7370cf5a28ba1f1389ac6e Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 2 19:00:08 2008 +0200 readded generator fetching from Merb.generators commit 6232a3f15f00d67977a4ff96648715aaef9a64bc Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 2 01:00:18 2008 +0200 moved slices generator back to merb-slices commit e90bc9c8f99892d21aa0a6287b59fd172dab71d7 Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Fri Aug 1 23:46:11 2008 +0200 added templater's new discovery feature to merb-gen 7c5a2025959a48981c27f571149c3a0f9fd70e3e Michael S. Klishin michael@novemberain.com 7ae90321e0485aea63f1fd2133e0b2ff3539c692 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/b1c39af1cb28a51fc2d6115fa1484dfdfb0db186 b1c39af1cb28a51fc2d6115fa1484dfdfb0db186 2008-08-01T18:22:16-07:00 2008-08-01T18:22:16-07:00 Make merb-assets use release task from Extlib cd71b93997cb8bbd3ae726e1464ff354fd9d052a Michael S. Klishin michael@novemberain.com