Commit graph

933 commits

Author SHA1 Message Date
Thomas Reynolds 4f78ecf367 test missing config error, fix nasty frontmatter caching bug. closes #209 2011-12-22 21:19:49 -08:00
Thomas Reynolds 3a5fc69a71 Merge commit '24664e4bbab4d1805b8c23509798e4305032ebe5' 2011-12-22 20:48:10 -08:00
Thomas Reynolds e0a2c4b301 update to new url 2011-12-22 14:48:23 -08:00
Eric Skogen 24664e4bba demonstrate bug with nested_layouts and YAML front matter 2011-12-22 16:38:34 -06:00
Thomas Reynolds 4d3c73b1a0 bump guard 2011-12-22 14:30:53 -08:00
Eric Skogen b9b2c2511c Merge branch 'master' of git://github.com/tdreyno/middleman 2011-12-22 16:27:02 -06:00
Eric Skogen e6cdb5cd3a Merge branch 'master' of github.com:audionerd/middleman 2011-12-22 16:26:29 -06:00
Thomas Reynolds 12494dc2c3 update changelog 2011-12-22 00:42:58 -08:00
Thomas Reynolds ecea540ec7 nested layouts. closes #208 2011-12-22 00:42:14 -08:00
Thomas Reynolds 4d2e0d8a7d More docs. Use ActiveSupport delegate to simplify code in places 2011-12-21 22:08:45 -08:00
Thomas Reynolds dba2cbd0ee final 3.0 alpha, hopefully 2011-12-21 20:18:41 -08:00
Thomas Reynolds 79ded54e9c fix cli docs 2011-12-21 13:23:43 -08:00
Thomas Reynolds 98b2b293c1 Fix custom commands for Ruby 1.9.x 2011-12-21 12:13:28 -08:00
Thomas Reynolds 21388f2103 test 3rd party commands 2011-12-21 11:11:38 -08:00
Thomas Reynolds 20ae42dcc0 Refactor CLI to allow 3rd party commands 2011-12-21 11:03:45 -08:00
Thomas Reynolds 7e20616fe6 change cf error 2011-12-20 17:15:26 -08:00
Thomas Reynolds c0ba3e2946 early attempt to fix jruby 2011-12-20 17:03:36 -08:00
Thomas Reynolds d553ee653b update to latest guard which vendors platform-specific support libraries 2011-12-19 09:35:10 -08:00
Thomas Reynolds cfd976e2ed update some deps 2011-12-17 20:19:12 -08:00
Thomas Reynolds 96bdd46552 more rdoc 2011-12-17 20:12:13 -08:00
Thomas Reynolds 559b42abb5 update changelog 2011-12-17 14:02:32 -08:00
Thomas Reynolds b73ff3100f Merge pull request #202 from tdreyno/feature/disabling-guard-cli-interactions
Disabling: guard's cli interactions.
2011-12-16 11:37:58 -08:00
Arron Mabrey a5fb18d3c8 Disabling: guard's cli interactions. 2011-12-16 08:54:09 -05:00
Thomas Reynolds 0692e71b63 test built in template and flags 2011-12-15 22:11:59 -08:00
Thomas Reynolds 869eb667e6 uglifier 2011-12-15 17:35:22 -08:00
Thomas Reynolds 104abe71dd fix fonts test 2011-12-15 16:40:07 -08:00
Thomas Reynolds 4b9f5771c2 fix directory indexes tests 2011-12-15 16:36:57 -08:00
Thomas Reynolds 43e6d669b5 fix clean tests 2011-12-15 16:33:09 -08:00
Thomas Reynolds 151c47672e update chained template test syntax 2011-12-15 16:21:34 -08:00
Thomas Reynolds 43fb28ea70 extend aruba timeout for travis 2011-12-15 16:15:28 -08:00
Thomas Reynolds 40986f17da Use Arbua for CLI testing. This is going to be HUGE 2011-12-15 16:05:15 -08:00
Eric Skogen 6a554ae45f fix bug in sitemap_tree which referred to app out of context 2011-12-14 23:51:28 -06:00
Thomas Reynolds a63334813f Merge branch 'master' of github.com:tdreyno/middleman 2011-12-14 21:18:30 -08:00
Thomas Reynolds c4543ba8aa bump version 2011-12-14 21:17:56 -08:00
Thomas Reynolds bc93d842dc Fix redcarpet 2 extensions and add test cases. Fixes #200 2011-12-14 10:22:06 -08:00
Thomas Reynolds 85e1918dd6 Merge pull request #201 from bhollis/master
Validate the template option for "middleman init"
2011-12-14 09:43:35 -08:00
Ben Hollis e1b338041b Validate the template option for "middleman init" 2011-12-13 23:58:47 -08:00
Thomas Reynolds 0b90a6a800 new as alias for init 2011-12-12 15:16:41 -08:00
Thomas Reynolds 7b88b5fb35 better readme. closes #186 2011-12-12 15:16:23 -08:00
Thomas Reynolds 0b5094e953 fix compressors. closes #192 2011-12-12 14:20:39 -08:00
Thomas Reynolds f4436eb49e testing alternative (passthrough) compressor works inline, but not through Sprockets 2011-12-12 13:54:04 -08:00
Eric Skogen 99c004d41f fix bug in sitemap_tree which referred to app out of context 2011-12-12 12:12:19 -06:00
Ben Hollis 911fe031bd Fix previous checkin on Ruby 1.8.7 2011-12-11 20:51:44 -08:00
Ben Hollis b73c58e59d Merge pull request #185 from bhollis/instancevars
Scenario for using instance vars to pass data to layouts and templates, and prevent changes to instance vars being shared between different templates.
2011-12-11 20:15:55 -08:00
Ben Hollis 97dc2c9742 Scenario for using instance vars to pass data to layouts and templates, and prevent
changes to instance vars being shared between different templates.
2011-12-11 20:13:41 -08:00
Thomas Reynolds a7c9c2bc84 Merge pull request #197 from audionerd/master
Switch to thin 1.3.1
2011-12-11 17:27:10 -08:00
audionerd d7518ebf84 thin 1.3.1 2011-12-11 18:55:20 -06:00
Thomas Reynolds 433275d71f frontmatter extensions. closes #191 2011-12-11 16:22:38 -08:00
Thomas Reynolds 6f4c1b816a default to redcarpet for markdown. closes #196 2011-12-11 16:02:40 -08:00
Thomas Reynolds f2221cd9a0 make sure failed builds exit with correct status code 2011-12-11 15:49:13 -08:00