Commit graph

2403 commits

Author SHA1 Message Date
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
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
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
Ben Hollis
ce914e508a Make rubocop TrivialAccessors warnings less annoying 2014-05-26 16:53:23 -07:00
Thomas Reynolds
18884cac95 Merge pull request #1285 from bhollis/extensions
Auto activating extensions
2014-05-26 14:26:09 -07:00
Ben Hollis
430521be83 Merge pull request #1281 from adamjonas/v3-stable
update rspec should syntax to expect
2014-05-25 21:13:34 -07:00
Ben Hollis
6561fea296 Change the auto activated extension feature to allow specifying different lifecycle events to activate at, allowing more extensions to auto activate. 2014-05-25 21:12:40 -07:00
Ben Hollis
70b3b87905 Move ExternalHelpers into a real extension 2014-05-25 21:06:37 -07:00
Ben Hollis
fed95f9c5e Convert external data to a real extension 2014-05-25 21:06:37 -07:00
Ben Hollis
e649bc2809 Convert FileWatcher to a real extension 2014-05-25 21:06:37 -07:00
Ben Hollis
67bb394852 Move some explicitly activated extensions to be auto activate 2014-05-25 21:06:36 -07:00
Ben Hollis
5d4cae2a06 Allow extensions to optionally register to be automatically activated before configuration. 2014-05-25 21:06:36 -07:00
Thomas Reynolds
f89a76747e Removed wrap_layout 2014-05-25 12:23:00 +09:00
Thomas Reynolds
4ab88e6577 Document and cleanup TemplateContext class. 2014-05-25 11:59:21 +09:00
Thomas Reynolds
1a461154b6 prep 2014-05-24 19:27:56 +09:00
Thomas Reynolds
72b945682a Fix threadsafety issue with assignment. Fixes #501. Also, WTF? 2014-05-24 19:18:12 +09:00
Thomas Reynolds
dc15006340 We are semver 2014-05-24 18:51:18 +09:00
Ben Hollis
9a3f9fe488 Clean up some Rubocop warnings that were previously suppressed. 2014-05-24 00:37:46 -07:00
Ben Hollis
dd7f06968a Clean up extension activation, helper registration, and sprockets autoload 2014-05-22 23:05:15 -07:00
Ben Hollis
18da7bb692 Improve documentation and mildly clean up core_extensions/extensions.rb 2014-05-22 22:36:56 -07:00
Ben Hollis
f60a49d2ce Improve documentation and variable naming for Middleman::Extensions 2014-05-22 21:48:37 -07:00
Thomas Reynolds
610716ee80 Work around possible mutable data issue #501 2014-05-22 19:20:43 +09:00
Ben Hollis
1a7da200d1 Fix before_render after change to hooks-0.4.0. Related to #1278. 2014-05-15 23:58:50 -07:00
Ben Hollis
dc33f6b3fa Fix before_render after change to hooks-0.4.0. Related to #1278. 2014-05-15 23:55:39 -07:00
Ben Hollis
5f9dec3dc8 Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman/middleman.gemspec
2014-05-15 23:41:04 -07:00
Ben Hollis
f29994e25a Fix tests after Padrino 0.12.2 release 2014-05-15 23:35:09 -07:00
Ben Hollis
82636e3596 Fixes to deal with Padrino 0.12.2 release 2014-05-15 23:30:49 -07:00
adamjonas
9887fe510c update rspec should syntax to expect 2014-05-15 11:51:42 -04:00
Thomas Reynolds
6238bb0716 Merge pull request #1279 from bhollis/extensions
Resource list manipulator priority
2014-05-12 09:25:24 -07:00
Thomas Reynolds
b81ce2956b Merge pull request #1280 from bhollis/revert-asset-hash
Revert 1f98d0f
2014-05-12 09:25:05 -07:00