deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2356 commits 11 branches 271 tags 23 MiB
Commit graph

159 commits

Author SHA1 Message Date
Ben Hollis 82636e3596 Fixes to deal with Padrino 0.12.2 release 2014-05-15 23:30:49 -07:00
Ben Hollis 2312f875e6 Revert "Add :format and :keep_original options to :asset_hash. Closes #1257" 
This reverts commit 1f98d0f4f0.

Conflicts:
	middleman-core/lib/middleman-core/extensions/asset_hash.rb
 2014-05-12 00:05:22 -07:00
Thomas Reynolds 1e43784cc2 remove queryable api 2014-04-28 10:28:16 -07:00
Thomas Reynolds ffe9226aac Remove root config options for minification 2014-04-28 10:21:14 -07:00
Thomas Reynolds 1f98d0f4f0 Add :format and :keep_original options to :asset_hash. Closes #1257 2014-04-14 10:05:00 -07:00
Thomas Reynolds 4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds 80256ec3c5 revert back to sass 3.2 and stable compass 2014-04-04 10:38:50 -07:00
Thomas Reynolds 638e2e64b7 Unvendor padrino 2014-04-04 10:22:34 -07:00
Thomas Reynolds fac4928d50 Update haml and sass deps 
Conflicts:
	Gemfile
	middleman/middleman.gemspec
 2014-04-03 10:01:18 -07:00
Thomas Reynolds f800a51fb2 Update haml and sass deps 2014-04-03 09:53:33 -07:00
Ben Hollis 5ce8549f03 Remove Asciidoc support in favor of a middleman-asciidoc extension. 2014-03-29 19:24:51 -07:00
Thomas Reynolds 8bc2fddb9d Remove static serving of non-Middleman folders 2014-03-25 16:57:57 -07:00
Thomas Reynolds ce7636ad18 remove Implied Extensions feature. Closes #1211 2014-03-20 17:12:41 -07:00
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
Ben Hollis 477f87e98a 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
Ben Hollis ca50f21fac "middleman init" will create a project in the current directory. Fixes #1181. 2014-02-19 23:13:59 -08:00
Thomas Reynolds 3995ad850c update padrino. 2014-02-18 18:30:29 -08:00
Thomas Reynolds 98e3c8aa79 remove instance variable and page block support 2014-01-03 15:49:54 -08:00
Thomas Reynolds 95eaeba960 Start cleaning up Rack internals 2014-01-01 19:09:47 -08:00
Thomas Reynolds a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Matt Simpson 21f575af3a Specify the full path to the NEWLINE constant 2013-12-28 19:43:59 -06:00
Thomas Reynolds c500039197 Add build-mode test cases to see if #1068 occurs 2013-11-29 14:57:35 -08:00
Paul C Pederson 56343c84ed localization by filename extension 2013-11-18 10:20:42 -08:00
Steven Sloan 955467f648 add link contents for mailto: link in kramdown markdown test 2013-11-13 22:46:06 -05:00
Thomas Reynolds e0a4b8f17d dont route kramdown mailto links through link_to. Closes #1058 2013-10-30 09:18:25 -07:00
Thomas Reynolds 22c977d426 Merge branch 'master' of github.com:middleman/middleman 2013-10-29 09:44:22 -07:00
Thomas Reynolds ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds 19c155349d Merge pull request #1044 from mojavelinux/asciidoc-renderer 
resolves #1043 added a renderer for AsciiDoc files
 2013-10-29 09:37:36 -07:00
Thomas Reynolds 9a2c1533e3 make page_classes prefix configurable 2013-10-29 09:33:27 -07:00
Andrew e8de5907fa Actually fix the issue, rather than pretending to 2013-10-25 18:09:36 +11:00
Andrew 2e70cc5d99 Update queryable interface so that it doesn't mutate 2013-10-25 14:48:23 +11:00
Ben Hollis e773e8c1a9 Fix tests under 1.8 by coercing Kramdown's OrderedHash into a real Hash. 2013-10-19 19:02:34 -07:00
Dan Allen 5439139b76 added cucumber tests for #1043, AsciiDoc support 2013-10-19 14:41:52 -06:00
Thomas Reynolds 1260188069 attempt to address asset host and hash combo, give up. 2013-10-15 14:33:25 -07:00
Thomas Reynolds c69909910d adjust some markdown tests 2013-09-28 00:23:13 -07:00
Ali Bosworth 2738e8ea69 Add test against URL fragments for asset hashes 2013-09-26 14:33:56 -07:00
Ben Hollis a746be1342 Use our magic linking functions from Kramdown, just like we do with Redcarpet. Fixes #999 2013-09-16 23:46:59 -07:00
Ben Hollis 268538f926 Make an effort to handle spaces in filenames in a way that url_for can handle. 2013-09-16 21:07:57 -07:00
Nicholas Hutchinson dcd760d4f8 Demonstrate issue with directory indexes and spaces in paths 
References #961
 2013-09-16 21:07:56 -07:00
Steven Sloan ee7c9e6a6e Add support/tests for Redcarpet 3.0.0 features 
- :underline
- :highlight
- :disable_indented_code_blocks

Fix support for
- :link_attributes
- :filter_html

separate Redcarpet extensions from renderer options, add specs for missing renderer options

add specs for the missing/new redcarpet extensions, [ :lax_spacing, :underline, :highlight, :quote, :disable_indented_code_blocks, :footnotes ]

fix link_attributes option for Redcarpet

patch Tilt's reverse option aliases (they were there for RC1)

adjust test data for Redcarpet toc_data to match the current way it renders in 3.0

revert tests that aren't in redcarpet 3.0.0

add a cucumber exempt tag for mri-1.8.x

move redcarpet 3 specific extensions to a separate scenario filtered by the no18 tag
 2013-08-27 11:37:37 -04:00
Thomas Reynolds ec060e0b6e change tests since coffee changed their output 2013-07-16 15:10:43 -07:00
Thomas Reynolds 8b970f9d92 support redcarpet's no_ flags which need to be re-implemented in our overrides. Fixes #951 2013-07-08 14:21:36 -07:00
Arron Mabrey 00d6a78872 Add expectation that .nojekyll file should exist to directory_index feature 2013-06-30 18:45:49 -04:00
Thomas Reynolds c7d3e7d601 Fix regex which was allowing i18n to file yaml files in the data folder 2013-06-24 13:56:32 -07:00
Thomas Reynolds 37752dc291 fix layouts with implied extensions 2013-06-24 13:39:14 -07:00
Thomas Reynolds d86dffa7c6 implement redirect support 2013-06-19 11:13:23 -07:00
Thomas Reynolds 0415b76d4f tests for content_tag escaping 2013-06-18 11:12:41 -07:00
Thomas Reynolds efe52f7cca Check if set is redefining a param at the class level. Fixes #939 2013-06-17 00:47:10 +00:00
Thomas Reynolds f0707c0968 Prevent relative asset helper from munging data URIs. Closes #938. 2013-06-15 16:22:14 -07:00
Thomas Reynolds 913d2b7049 Implement generic which is a simple way to build a file from Rack 2013-06-13 09:05:13 -07:00