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

3099 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds d82ac590db Cop 2016-01-14 11:21:42 -08:00
Thomas Reynolds 5f8beba4b3 Perf 2016-01-14 11:05:41 -08:00
Thomas Reynolds c213bd19df Move block run 2016-01-12 17:11:56 -08:00
Thomas Reynolds 8daa5eba3e Add back app.ignore 2016-01-12 10:53:25 -08:00
Thomas Reynolds 18e4ee41d0 Allow 2.3 failure 2016-01-12 10:46:50 -08:00
Thomas Reynolds 95c7a53291 Convert more basic config commands to ConfigExtensions 2016-01-12 10:38:53 -08:00
Thomas Reynolds 56d71fe7d6 Merge pull request #1747 from jsdalton/mode-check-helper 
Add app method to detect mode
 2016-01-11 15:57:23 -08:00
Jim Dalton f954415c95 Add app method to detect mode 2016-01-11 14:24:28 -08:00
Thomas Reynolds edd5eb2057 Prep 2016-01-11 13:58:19 -08:00
Thomas Reynolds 7bc9e03642 Merge pull request #1746 from middleman/refactor/ignores 
Create ConfigExtension to simplify the APIs for config vs Step.
 2016-01-11 13:44:35 -08:00
Thomas Reynolds 179268a4f6 Create ConfigExtension to simplify the APIs for config vs Step. Fixes #1743. Fixes #1745 2016-01-11 13:05:41 -08:00
Thomas Reynolds 8f66077dd0 Allow 2.3.0 failure until frozen string bug is fixed upstream 2016-01-10 17:25:11 -08:00
Thomas Reynolds 98fe7ce7d2 WIP encoding test 2016-01-10 17:24:43 -08:00
Thomas Reynolds c6401f1cd9 Fixes #1716 2016-01-10 17:14:41 -08:00
Thomas Reynolds 5cac6a1896 Add test for #1718 2016-01-10 16:56:18 -08:00
Thomas Reynolds b4a6a503b3 Fixes #1719 2016-01-10 16:47:24 -08:00
Thomas Reynolds 47d0e1cb7b update changelog 2016-01-10 16:47:24 -08:00
Thomas Reynolds 4243676073 Merge pull request #1741 from jfeaver/fix/msoffice-files-as-binary 
consider all MS Office files to be binary
 2016-01-10 16:30:20 -08:00
Nathan Feaver 17df162e7b consider all MS Office files to be binary 2016-01-10 06:28:18 -07:00
Thomas Reynolds 46ca147560 Merge pull request #1740 from GUI/rewrite-ignore 
Add rewrite_ignore option to asset_hash extension
 2016-01-09 19:15:38 -08:00
Nick Muerdter 37be89ed68 Add rewrite_ignore option to asset_host, cache_buster, relative_assets. 2016-01-09 08:06:47 -07:00
Nick Muerdter 0563523a81 Add rewrite_ignore option to asset_hash extension. 
This allows for configuring the files that will be skipped when
performing URL rewriting on the file content. This differs from the
existing `ignore` option, which configures the files that won't have
hashes added to the filename.
 2016-01-08 15:04:45 -07:00
Thomas Reynolds 1e8080b44c Merge pull request #1739 from douo/patch-1 
Fixes #1723
 2016-01-07 11:38:06 -08:00
Thomas Reynolds a0105c9b48 Merge pull request #1738 from johnnyshields/patch-2 
Add SVG to the default list of gzipped exts
 2016-01-07 11:36:34 -08:00
Tiou Lims a7631b2f0d Fixes #1723 2016-01-07 23:23:50 +08:00
Johnny Shields 133c02d05c Add SVG to the default list of gzipped exts 2016-01-07 09:43:35 +09:00
Thomas Reynolds 1605f425e8 Fixes #1733 2016-01-05 10:58:22 -08:00
Thomas Reynolds bfb6a7fa16 Merge pull request #1725 from maxmeyer/feature/phantomjs 
Added phantomjs as gem to make test suite pass
 2016-01-05 10:34:46 -08:00
Thomas Reynolds 41212d7fa3 Merge pull request #1713 from tricknotes/ruby-2.3 
Test against Ruby 2.3.0 on Travis CI
 2016-01-05 10:34:39 -08:00
Thomas Reynolds 62b17d38ad Merge pull request #1734 from GhostGambler/issue-1702 
Issue #1702
 2016-01-05 09:50:41 -08:00
Thomas Reynolds fed3fae6bb Merge pull request #1733 from GhostGambler/issue-1709 
Test for issue 1709; parent relations with localized and non-localized sources
 2016-01-05 09:50:02 -08:00
Ulrich Gabor 298b3909ed First fix to actually use the encoding option again 2016-01-05 15:15:06 +01:00
Ulrich Gabor 1ca5be7b19 Tests for issue #1702 2016-01-05 15:15:01 +01:00
Ulrich Gabor bdeb19059a Test for issue 1709; parent relations with localized and non-localized sources 2016-01-05 15:08:26 +01:00
Dennis Günnewig b0a4d53963 Added phantomjs as gem to make test suite pass 2016-01-01 20:51:26 +01:00
Thomas Reynolds 5684caeee6 Merge pull request #1721 from bhollis/issue1721-relative-paths 
relative URLs don't work in image_tag
 2015-12-30 16:04:09 -08:00
Thomas Reynolds 03e13c5a26 Merge pull request #1715 from bhollis/issue1715-asset-url 
Error calling Util#asset_url from DefaultHelpers#asset_url
 2015-12-30 16:01:16 -08:00
Thomas Reynolds da1f3f7af6 Merge pull request #1710 from tricknotes/exit-with-1 
Exit with error code on `init` command failed
 2015-12-30 15:59:27 -08:00
Ben Hollis 9311a72e4a Use our relative_path_from_resource helper in asset_url. 2015-12-28 20:52:22 -08:00
Ben Hollis 412f6ac1fc Fix #1721 by passing through options to url_for. 2015-12-28 20:52:22 -08:00
Ben Hollis d464162e8e Fix #1715 by passing along path in DefaultHelpers#asset_url. 2015-12-28 17:40:21 -08:00
Ryunosuke SATO e56227c945 Exit with error code on init command failed 2015-12-27 18:12:53 +09:00
Ryunosuke SATO 2dcd2c5b1d Test against Ruby 2.3.0 on Travis CI 2015-12-26 01:11:15 +09:00
Thomas Reynolds 3b596d5e3e Merge pull request #1711 from tricknotes/ruby-2.2.4 
Test against 2.2.4 that is the latest of Ruby 2.2
 2015-12-24 15:09:20 -08:00
Ryunosuke SATO 3fdd963923 Test against 2.2.4 that is the latest of Ruby 2.2 2015-12-23 23:54:04 +09:00
Thomas Reynolds 4a8cd4c3d2 fix extension test 2015-12-21 13:27:44 -08:00
Thomas Reynolds a5821bccec Fix asset hash with query string or hash params. Closes #1411 2015-12-21 13:07:01 -08:00
Thomas Reynolds ba0416b330 Set min version in gemspec 2015-12-20 13:47:18 -08:00
Thomas Reynolds 6aeda854c0 Update local extension template 2015-12-20 12:48:05 -08:00
Thomas Reynolds 5d0f12e6ca Merge pull request #1707 from jordanandree/v4-skip-front-matter-for-ignored-resource 
Skip front matter parsing for ignored resources
 2015-12-17 15:28:05 -08:00