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

1068 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Vasily Fedoseyev c9b4edcc0a Add project vendored css and js into sprockets paths 2012-02-14 00:17:32 +04:00
Thomas Reynolds 740d4a913f change compass sprites messaging 
exit
 2012-02-12 11:51:29 -08:00
Thomas Reynolds 5842bf8e5b allow extensionless files to be previewed and built. fixes #270, but requires alternative layouts be placed in a layouts/ directory now. 2012-02-12 11:45:42 -08:00
Thomas Reynolds baaa3fd148 change little piece of frontmatter logic 2012-02-12 10:10:59 -08:00
Thomas Reynolds 8094af43d4 Merge pull request #268 from pusewicz/fix-cli-bundler 
Fix middleman init MY_PROJECT --bundler
 2012-02-11 09:42:09 -08:00
Piotr Usewicz cf991bfb89 Fix middleman init --bundler 
Closes #265.
 2012-02-11 09:39:45 +00:00
Piotr Usewicz f5edfa75df Fix whitespace 2012-02-11 09:35:49 +00:00
Thomas Reynolds a20570bd28 Merge pull request #267 from bhollis/sitemap 
Remove unused methods from Sitemap::Store
 2012-02-11 00:05:06 -08:00
Ben Hollis 39046ce029 Remove unused methods from Sitemap::Store. If these end up being needed again it'd be better to just filter the #pages list. 2012-02-10 23:36:06 -08:00
Thomas Reynolds 6799606324 Merge pull request #263 from bhollis/master 
Get rid of build_reroute
 2012-02-10 14:37:37 -08:00
Ben Hollis d483d8bc54 Memoize Sitemap::Page#destination_path 2012-02-09 09:39:24 -08:00
Ben Hollis fdbd301a32 Get rid of Middleman::Sitemap::Store#all_paths and #each in favor of #pages. Dealing with page objects all over the place instead of paths provides a lot of opportunities for cleaner code. 2012-02-08 23:00:29 -08:00
Ben Hollis 382107d403 Get rid of build_reroute. The last thing using it was the sprockets extension, though it didn't appear to need it since removing the build_reroute call leaves tests passing, and the test site I tried still generated JS from CoffeeScript just fine. 2012-02-08 22:13:49 -08:00
Ben Hollis 57061a17c0 Update version so path-based Gemfile dependencies work 2012-02-08 22:11:20 -08:00
Thomas Reynolds b82ad07b51 adding json to layoutless list 2012-02-08 08:52:41 -08:00
Thomas Reynolds cdff84b84a continue trying to fix compass issue 2012-02-08 08:49:40 -08:00
Thomas Reynolds 79eeba9d1a switch built-in css compressor 2012-02-08 08:47:34 -08:00
Thomas Reynolds b6f85ccce9 Merge branch 'master' of github.com:middleman/middleman 2012-02-07 18:04:59 -08:00
Thomas Reynolds 8286879f36 sprockets-sass was overwriting image-url and breaking relative assets. Fixes #256 2012-02-05 11:43:19 -08:00
Thomas Reynolds c8c6a1938e Merge pull request #261 from bhollis/page 
Callback-based rerouting
 2012-02-05 10:33:25 -08:00
Ben Hollis e136fab77c Use a page_by_destination lookup to make rerouting work both ways, in build and during preview server. 2012-02-04 23:07:02 -08:00
Ben Hollis e27e0cdd44 Directory indexes work completely now, in preview and with dotfiles. 2012-02-03 00:29:07 -08:00
Ben Hollis ca1f3ddf83 Directory indexes now work during build, with the exception of .htaccess files. 2012-02-02 21:47:54 -08:00
Ben Hollis 4ce6913baf The beginnings of refactoring page rerouting. Added methods to Sitemap::Store and Sitemap::Page to collect and execute reroute callbacks, and rework builder to use page methods (simplifying it greatly in the process). All tests that don't involve directory indexes pass - next step is to make the directory index extension register its callbacks with Sitemap::Store#reroute. 2012-01-31 23:43:05 -08:00
Ben Hollis a41bf57f2d Clarify in the documentation what "path" means for Sitemap::Store and Sitemap::Page 2012-01-31 22:57:55 -08:00
Ben Hollis 2eec7e11ba Refactor protected method normalize_path out of Sitemap::Store 2012-01-31 22:38:39 -08:00
Ben Hollis 1fc97d9d7b A minor simplification of Sitemap::Store#path - it can no longer take a block 2012-01-31 22:15:45 -08:00
Thomas Reynolds b72fb23435 Merge branch 'master' of github.com:middleman/middleman 2012-01-31 21:30:58 -08:00
Thomas Reynolds 251a2e0eb3 add failing tests for compass relative assets 2012-01-31 21:30:45 -08:00
Thomas Reynolds ceb5f53d57 enable jruby 2012-01-30 10:10:38 -08:00
Thomas Reynolds 2dd8531eb5 Merge pull request #249 from roryokane/patch-1 
grammar fix; changed erroneous “it's” to “its”
 2012-01-24 11:42:26 -08:00
Rory O’Kane fad23a7024 grammar fix; changed erroneous “it's” to “its” 
“its own collection” is the collection belonging to it (the community). The old “it's” meant “it is own collection”.
 2012-01-24 13:48:54 -05:00
Thomas Reynolds 599ea94f5e Merge branch 'master' of github.com:middleman/middleman 2012-01-16 20:36:10 -08:00
Thomas Reynolds 73bcd4c12f rearrange some watcher stuff 2012-01-16 20:35:28 -08:00
Thomas Reynolds 5a5ebdc37f Merge pull request #241 from audionerd/master 
Clarify the documentation of a page's "eponymous" directory
 2012-01-16 18:08:50 -08:00