Commit graph

18 commits

Author SHA1 Message Date
Ben Hollis
ab238c32e5 Don't use data.page.title. This was a regression from 3.x 2014-05-10 19:37:48 -07:00
Thomas Reynolds
f513ab77b3 Rubocop'd 2014-04-29 11:43:05 -07:00
Thomas Reynolds
6760d855bc hashrocket killa 2014-04-29 10:50:21 -07:00
Ted Lilley
e57318f7c6 update to html5-boilerplate 4.3.0 2014-04-12 15:17:38 -04:00
Thomas Reynolds
4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Ben Hollis
60f712e6ba Merge branch 'v3-stable'
Conflicts:
	.travis.yml
	Gemfile
	middleman-cli/lib/middleman-cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
	middleman-core/lib/middleman-core/templates.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
Karl Freeman
6c84ed4674 whitespace [ci skip] 2014-03-25 13:13:36 +00:00
Karl Freeman
5a38827b01 middleman-templates has no executable [ci skip] 2014-03-25 12:06:31 +00:00
Karl Freeman
1de871a57b not needed 2014-03-25 09:07:27 +00:00
Karl Freeman
ce83e502f6 more consistency across all gems
- rubocop'd for cosmetics
2014-03-25 08:50:28 +00:00
Karl Freeman
845d529a50 don't load local templates if no HOME is set 2014-03-25 08:21:53 +00:00
Karl Freeman
ad14766278 Although equivalent, clearer for non-*nix based systems 2014-03-24 10:39:25 +00:00
Ben Hollis
04d94d9b60 Merge pull request #1201 from middleman/templates-rejig
Templates rejig
2014-03-15 19:59:46 -07:00
Karl Freeman
8e8ddbc301 rejig templates, deprecate 'empty' template and rubocop them 2014-03-15 13:32:11 +00:00
Karl Freeman
24f7143973 shouldn't be here 2014-03-13 11:18:20 +00:00
Karl Freeman
554577b139 too aggressive with the deletes... 2014-03-13 10:05:30 +00:00
Karl Freeman
9de092ba5f gemfiles are required but lets still keep the convenience of bundling 2014-03-13 09:46:49 +00:00
Karl Freeman
772de85ce3 move to middleman-templates 2014-03-11 11:07:55 +00:00