deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1355 commits 11 branches 271 tags 23 MiB
Commit graph

1355 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Hollis de92015085 Fix usage of a 1.9-only method in Sitemap::Page 2012-03-11 23:41:48 -07:00
Ben Hollis c6c3021593 Fix issue #302 2012-03-11 23:33:46 -07:00
Ben Hollis 6edefe3c68 Further tweaks that expose another bug - ignore with proxies leads to Not Found errors. Same issue as #302. 2012-03-11 23:09:43 -07:00
Ben Hollis 9555266ac1 Variables not passed to proxies when they are built. Possibly related to issue #302. 2012-03-11 22:49:21 -07:00
Ben Hollis 54b5304264 Ignore pidfiles 2012-03-11 22:40:54 -07:00
Ben Hollis 3fde255610 Change gzip_assets output to print size difference in human terms 2012-03-11 11:06:48 -07:00
Thomas Reynolds 89bd4f1eaf correct a relative_assets issue 2012-03-10 19:51:47 -08:00
Thomas Reynolds 7d7f9a20ef i18n not ready for primetime yet 2012-03-10 19:40:04 -08:00
Thomas Reynolds 08f5e64858 bump listen dep 2012-03-10 18:57:47 -08:00
Thomas Reynolds d9a82beb8a merge i18n extension 2012-03-10 18:57:00 -08:00
Thomas Reynolds 8d22fee8d8 Merge pull request #298 from bhollis/i18n-helpers 
Fix Padrino helpers that require an i18n locale to be present
 2012-03-09 10:19:15 -08:00
Ben Hollis e7df250c4d Include "i18n" gem in middleman-core gemspec 2012-03-08 23:05:59 -08:00
Thomas Reynolds dc5bbe8522 Merge pull request #305 from bhollis/sitemap 
Fix current_page helper
 2012-03-08 09:12:00 -08:00
Ben Hollis 4830f51664 Fix current_page 2012-03-07 22:08:41 -08:00
Ben Hollis efe1d45af7 Rewrite sitemap_traversal tests to better reflect what should actually happen, and to expose a bug in current_page. 2012-03-07 22:08:41 -08:00
Ben Hollis 739a8633ae Rename sitemap_traversal.features to sitemap_traversal.feature so it will actually be run. Also rename ignore_already_minified.features for the same reason. 2012-03-07 22:08:16 -08:00
Thomas Reynolds 38d1059be2 Merge pull request #300 from bhollis/url 
A url helper that strips directory indexes
 2012-03-05 08:36:14 -08:00
Ben Hollis 0470fa3083 Remove nonsense comment 2012-03-04 23:37:16 -08:00
Ben Hollis 627b6c1462 A url helper that strips directory indexes 2012-03-04 23:26:30 -08:00
Thomas Reynolds b093bb9f51 fix asset_hash tests from what I assume are random hash key ordering issues across rubies 2012-03-04 23:03:21 -08:00
Thomas Reynolds b9475bbccc Merge asset_hash extension 2012-03-04 22:53:43 -08:00
Thomas Reynolds 49ae07bab8 Merge pull request #299 from bhollis/decruft 
Three small cleanups
 2012-03-04 22:49:41 -08:00
Thomas Reynolds b6415909dc Merge pull request #266 from bhollis/master 
Extension that will pre-Gzip JS and CSS files
 2012-03-04 22:44:31 -08:00
Ben Hollis 481467a5ac Name the server class so it isn't so confusing when debugging 2012-03-04 17:45:37 -08:00
Ben Hollis dc0249b8b9 Remove --relative CLI option in favor of just turning on relative_assets in config.rb 2012-03-04 17:30:09 -08:00
Ben Hollis ac9ae8fcee Rename tilt_template to render_to_file 2012-03-04 17:26:44 -08:00
Ben Hollis 617f73c8db Fix Padrino helpers that require an i18n locale to be present 2012-03-04 17:20:57 -08:00
Ben Hollis af605a909b Rewrite gzip_assets to work as a post-build step and to leave uncompressed versions around. 2012-03-04 16:42:14 -08:00
Ben Hollis cf9e59db83 Merge remote-tracking branch 'origin/master' into gzip 2012-03-04 15:36:36 -08:00
Ben Hollis 073086b79c Extension to add hash values to asset filenames. This extension causes asset file types (images, scripts, stylesheets, etc) to have a unique identifier appended to their filename that consists of a hash of their contents. This extension also includes a Rack middleware that rewrites references to these assets in HTML, JavaScript, and CSS files, eliminating the need to use special helper functions to include modified filenames in references. 2012-03-04 15:24:38 -08:00
Thomas Reynolds c2f498e26e load template.rb files from local templates 2012-03-03 16:52:49 -08:00
Thomas Reynolds 70dc453c25 Readd Middleman::Features namespace for backwards compatibility. Closes #280 2012-03-03 16:49:51 -08:00
Thomas Reynolds 410b6b37d1 make sure html5 template has correct paths setup. Fixes #291 2012-03-03 16:40:03 -08:00
Thomas Reynolds a6d099c4a0 massage some deps 2012-03-03 16:23:06 -08:00
Thomas Reynolds b191cb8b7e temporarily disable config.rb reloading 2012-03-03 15:58:17 -08:00
Thomas Reynolds 06ad7a5c88 update redcarpet dep 2012-03-03 15:56:50 -08:00
Thomas Reynolds 332a503460 Always pretend we no nothing about the build folder. Fixes #283 2012-03-03 15:49:49 -08:00
Thomas Reynolds e285045fc5 Merge branch 'master' of github.com:middleman/middleman 2012-03-03 15:32:25 -08:00
Thomas Reynolds ca28c7e55d Merge pull request #295 from bhollis/sass-partials 
New scenario showing Sass partials don't work in build
 2012-03-01 13:44:21 -08:00
Thomas Reynolds 445b66bed7 test backwards compatible request.params template values. closes #294 2012-03-01 13:43:47 -08:00
Thomas Reynolds 576463f361 fix merge 2012-03-01 13:24:56 -08:00
Ben Hollis fc2f761e2f New scenario showing Sass partials don't work in build 2012-02-29 21:58:01 -08:00
Thomas Reynolds 1ee1a06291 switch to guard/listen 2012-02-25 15:53:23 -08:00
Ben Hollis 81c83fafa6 Merge remote-tracking branch 'origin/master' 2012-02-23 21:33:05 -08:00
Thomas Reynolds 3c78d9f171 Merge pull request #271 from Vasfed/master 
Add project vendored css and js into sprockets path
 2012-02-19 16:24:44 -08:00
Thomas Reynolds d69ae55fa8 new forum 2012-02-18 21:51:02 -08:00
Thomas Reynolds 5b2381f6eb sorry jruby 2012-02-18 10:04:28 -08:00
Thomas Reynolds 4e4e835bf5 basic pid file 2012-02-18 10:00:54 -08:00
Thomas Reynolds 3cabbcf5a4 test jruby 2012-02-18 09:02:16 -08:00
Vasily Fedoseyev 7458acae4d add test for vendored js 2012-02-17 03:22:48 +04:00