middleman/middleman-core/lib/middleman-core
Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -08:00
..
core_extensions Prefer loading layouts from layouts_dir over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176. 2014-02-20 08:50:07 -08:00
meta_pages update padrino. 2014-02-18 18:30:29 -08:00
renderers Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
sitemap Corrected a handful of documentation typos. 2014-01-09 19:49:41 -08:00
step_definitions rely directly on rack-mock 2014-01-02 21:45:42 -08:00
application.rb Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
config_context.rb Put template rendering in a jail 2014-01-02 16:05:39 -08:00
configuration.rb build a config file jail 2013-12-31 18:21:30 -08:00
core_extensions.rb Implemented Rubocop 2013-12-28 00:47:39 +00:00
extension.rb Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
extensions.rb Merge remote-tracking branch 'origin/v3-stable' 2014-02-22 18:11:37 -08:00
file_renderer.rb move rendering into specialized File and Template rendering classes. 2014-01-03 13:40:37 -08:00
load_paths.rb Implemented Rubocop 2013-12-28 00:47:39 +00:00
logger.rb upgrade to newest activesupport 2014-01-02 14:38:18 -08:00
meta_pages.rb Implemented Rubocop 2013-12-28 00:47:39 +00:00
preview_server.rb spring cleaning util and discovery of nasty variable mutating in url_for 2013-12-31 14:41:17 -08:00
profiling.rb Implemented Rubocop 2013-12-28 00:47:39 +00:00
sitemap.rb move current_path in to the template context, one less piece of global state 2014-01-03 14:56:16 -08:00
step_definitions.rb Implemented Rubocop 2013-12-28 00:47:39 +00:00
template_context.rb move current_path in to the template context, one less piece of global state 2014-01-03 14:56:16 -08:00
template_renderer.rb remove instance variable and page block support 2014-01-03 15:49:54 -08:00
util.rb Corrected a handful of documentation typos. 2014-01-09 19:49:41 -08:00
version.rb update padrino. 2014-02-18 18:30:29 -08:00