Commit graph

2880 commits

Author SHA1 Message Date
Thomas Reynolds
434d55b1ae See if code climate hooks work 2014-06-20 14:09:51 -07:00
Ben Hollis
ad4b441dc3 Fixed implementation of Middleman::Util#path_match, added tests for it 2014-06-16 21:44:19 -07:00
Thomas Reynolds
8989e27769 Rubocop auto fix 2014-06-16 09:05:24 -07:00
Thomas Reynolds
fe5247d9d9 Add <head> to 404 so Livereload can add its script to the page 2014-06-16 08:58:16 -07:00
Thomas Reynolds
c6543b7c27 Add <head> to 404 so Livereload can add its script to the page 2014-06-16 08:57:56 -07:00
Ben Hollis
e7108a5656 Merge pull request #1288 from bhollis/data
@bhollis metadata rewrite/refactor
2014-06-14 17:12:10 -07:00
Ben Hollis
2ef842a730 Fix references to store in traversal 2014-06-14 13:08:03 -07:00
Ben Hollis
f63feaf017 Do not use ShowExceptions during tests, it confuses things 2014-06-14 13:05:32 -07:00
Ben Hollis
f07bed4ecf Fix custom layouts tests 2014-06-14 12:38:44 -07:00
Ben Hollis
416428444c Let users add metadata via #page 2014-06-14 11:31:53 -07:00
Ben Hollis
e6ec5f31de Fix meta pages 2014-06-14 11:31:53 -07:00
Ben Hollis
85cebdb7e9 rubocop 2014-06-14 11:31:53 -07:00
Ben Hollis
cb2b13778e Fix i18n 2014-06-14 11:31:53 -07:00
Ben Hollis
2beb774eb9 Put back request_path, I get it now 2014-06-14 11:31:53 -07:00
Ben Hollis
b0ea4e7608 Tweak resource manipulator order 2014-06-14 11:31:53 -07:00
Ben Hollis
5760d64ef9 More ignores 2014-06-14 11:31:53 -07:00
Ben Hollis
0309753561 Change when file listeners are registered in order to make cache invalidation work 2014-06-14 11:31:53 -07:00
Ben Hollis
096f5ee356 Use source file, not path, to look up frontmatter data 2014-06-14 11:31:53 -07:00
Ben Hollis
bf8f02d563 Turn routing into an extension 2014-06-14 11:31:52 -07:00
Ben Hollis
213c672969 Fix a lot of breakage caused by removing/hiding accessors 2014-06-14 11:31:52 -07:00
Ben Hollis
78b7bbb92a TODO metadata for path extension 2014-06-14 11:31:52 -07:00
Ben Hollis
d687677e38 Mess around with liquid 2014-06-14 11:31:52 -07:00
Ben Hollis
adfad92f8f Get rid of raw_data 2014-06-14 11:31:52 -07:00
Ben Hollis
5c04c2f42b More trimming 2014-06-14 11:31:52 -07:00
Ben Hollis
d83d6e077c Extensionize liquid, bring back provides_metadata_for_path 2014-06-14 11:31:52 -07:00
Ben Hollis
c285848866 Clean up i18n a bit, stake out some territory around routing and resource 2014-06-14 11:31:52 -07:00
Ben Hollis
69396d34c1 Start gutting the provides_metadata methods and move some of frontmatter over 2014-06-14 11:31:52 -07:00
Thomas Reynolds
c59cefdafc Merge pull request #1293 from middleman/environments
Environments
2014-06-13 11:12:04 -07:00
Thomas Reynolds
449d38bcd2 Update to rspec 3 2014-06-11 13:39:40 -07:00
Thomas Reynolds
a21dca025e Separate Environments from Modes 2014-06-11 10:28:30 -07:00
Thomas Reynolds
d035b449ea Rename Rubocop 2014-06-11 10:23:33 -07:00
Thomas Reynolds
c3b22fe325 sass renderer shouldn't explode if haml isn't available 2014-06-11 10:19:10 -07:00
Thomas Reynolds
a35a38dd5f Merge pull request #1295 from nevir/patch-1
`Rubocop` is now `RuboCop`
2014-06-11 10:18:32 -07:00
Thomas Reynolds
7840ebf98a move compass ext out of the main repo 2014-06-11 09:25:59 -07:00
Thomas Reynolds
4b5c6738e5 Merge pull request #1291 from middleman/deprecate_compass
Extract compass
2014-06-11 09:20:45 -07:00
Thomas Reynolds
ee1d89fe55 fix whitespace 2014-06-11 09:19:00 -07:00
Ian MacLeod
d1c71e473d Rubocop is now RuboCop
See ff167d8f20
2014-06-09 17:34:33 -07:00
Thomas Reynolds
29bf25ace6 Extract compass support into extension, rewrite all features that rely on it to be pure Ruby 2014-06-03 09:01:46 -07:00
Thomas Reynolds
3879be0f23 Add proc as a means of defining a rewriter ignore. Closes #1289 2014-06-02 15:56:07 -07:00
Thomas Reynolds
c53773a4a1 Merge pull request #1261 from middleman/inline_url_rewriter
Abstracted HTML rewriter
2014-05-30 14:51:41 -07:00
Thomas Reynolds
927a1758ba Rack-based HTML rewriter 2014-05-30 14:48:34 -07:00
Thomas Reynolds
1006739e98 merge PR 2014-05-30 14:23:44 -07:00
Thomas Reynolds
ca0573d92a Merge pull request #1266 from 747/working
A quick fix for finding eponymous parents
2014-05-30 14:20:11 -07:00
Thomas Reynolds
ba01a0a72b more templates back into cli 2014-05-26 18:44:11 -07:00
Thomas Reynolds
be5fad55ca Merge branch 'master' of github.com:middleman/middleman 2014-05-26 18:00:44 -07:00
Thomas Reynolds
00bbdfa254 unvendor fastimage 2014-05-26 18:00:39 -07:00
Thomas Reynolds
c2512e9093 update more files to non-hashrocket syntax 2014-05-26 17:58:35 -07:00
Ben Hollis
7a5865a407 gsub to sub 2014-05-26 17:13:16 -07:00
Ben Hollis
b48a767595 Use alias_method instead of defining an alias method for current_page 2014-05-26 17:13:10 -07:00
Ben Hollis
7108c29035 Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/version.rb
2014-05-26 16:59:04 -07:00