middleman

deac/middleman

Fork 0

Commit graph

4243676073 Merge pull request #1741 from jfeaver/fix/msoffice-files-as-binary Thomas Reynolds 2016-01-10 16:30:20 -08:00
17df162e7b consider all MS Office files to be binary Nathan Feaver 2016-01-10 06:28:18 -07:00
46ca147560 Merge pull request #1740 from GUI/rewrite-ignore Thomas Reynolds 2016-01-09 19:15:38 -08:00
37be89ed68 Add rewrite_ignore option to asset_host, cache_buster, relative_assets. Nick Muerdter 2016-01-09 08:06:47 -07:00
0563523a81 Add rewrite_ignore option to asset_hash extension. Nick Muerdter 2016-01-08 14:56:42 -07:00
1e8080b44c Merge pull request #1739 from douo/patch-1 Thomas Reynolds 2016-01-07 11:38:06 -08:00
a0105c9b48 Merge pull request #1738 from johnnyshields/patch-2 Thomas Reynolds 2016-01-07 11:36:34 -08:00
a7631b2f0d Fixes #1723 Tiou Lims 2016-01-07 23:23:50 +08:00
133c02d05c Add SVG to the default list of gzipped exts Johnny Shields 2016-01-07 09:43:35 +09:00
1605f425e8 Fixes #1733 Thomas Reynolds 2016-01-05 10:58:11 -08:00
bfb6a7fa16 Merge pull request #1725 from maxmeyer/feature/phantomjs Thomas Reynolds 2016-01-05 10:34:46 -08:00
41212d7fa3 Merge pull request #1713 from tricknotes/ruby-2.3 Thomas Reynolds 2016-01-05 10:34:39 -08:00
62b17d38ad Merge pull request #1734 from GhostGambler/issue-1702 Thomas Reynolds 2016-01-05 09:50:41 -08:00
fed3fae6bb Merge pull request #1733 from GhostGambler/issue-1709 Thomas Reynolds 2016-01-05 09:50:02 -08:00
298b3909ed First fix to actually use the encoding option again Ulrich Gabor 2016-01-05 15:11:14 +01:00
1ca5be7b19 Tests for issue #1702 Ulrich Gabor 2016-01-05 15:10:49 +01:00
bdeb19059a Test for issue 1709; parent relations with localized and non-localized sources Ulrich Gabor 2016-01-05 15:08:26 +01:00
b0a4d53963 Added phantomjs as gem to make test suite pass Dennis Günnewig 2016-01-01 20:36:01 +01:00
5684caeee6 Merge pull request #1721 from bhollis/issue1721-relative-paths Thomas Reynolds 2015-12-30 16:04:09 -08:00
03e13c5a26 Merge pull request #1715 from bhollis/issue1715-asset-url Thomas Reynolds 2015-12-30 16:01:16 -08:00
da1f3f7af6 Merge pull request #1710 from tricknotes/exit-with-1 Thomas Reynolds 2015-12-30 15:59:27 -08:00
9311a72e4a Use our relative_path_from_resource helper in asset_url. Ben Hollis 2015-12-28 20:50:55 -08:00
412f6ac1fc Fix #1721 by passing through options to url_for. Ben Hollis 2015-12-28 20:03:47 -08:00
d464162e8e Fix #1715 by passing along path in DefaultHelpers#asset_url. Ben Hollis 2015-12-28 17:40:21 -08:00
e56227c945 Exit with error code on init command failed Ryunosuke SATO 2015-12-23 23:29:16 +09:00
2dcd2c5b1d Test against Ruby 2.3.0 on Travis CI Ryunosuke SATO 2015-12-26 01:11:15 +09:00
3b596d5e3e Merge pull request #1711 from tricknotes/ruby-2.2.4 Thomas Reynolds 2015-12-24 15:09:20 -08:00
3fdd963923 Test against 2.2.4 that is the latest of Ruby 2.2 Ryunosuke SATO 2015-12-23 23:54:04 +09:00
4a8cd4c3d2 fix extension test Thomas Reynolds 2015-12-21 13:27:44 -08:00
a5821bccec Fix asset hash with query string or hash params. Closes #1411 Thomas Reynolds 2015-12-21 13:07:01 -08:00
ba0416b330 Set min version in gemspec Thomas Reynolds 2015-12-20 13:47:18 -08:00
6aeda854c0 Update local extension template Thomas Reynolds 2015-12-20 12:48:01 -08:00
5d0f12e6ca Merge pull request #1707 from jordanandree/v4-skip-front-matter-for-ignored-resource Thomas Reynolds 2015-12-17 15:28:05 -08:00
e035d625c8 skip front matter on ingored resources jordanandree 2015-12-17 14:01:37 -05:00
b2b461935d Here we go v4.0.0 Thomas Reynolds 2015-12-15 19:58:04 -08:00
9e5b137ed8 Really fix #1689 Thomas Reynolds 2015-12-15 09:58:22 -08:00
6af784d5d5 One more RC v4.0.0.rc.3 Thomas Reynolds 2015-12-14 11:02:07 -08:00
0e620a1ba1 Resolve Contracts warning Thomas Reynolds 2015-12-14 10:22:27 -08:00
308ea6db5a Include :locales and :data in live-reloadable types feature/livereload-locales-data Johnny Shields 2015-12-06 21:58:18 +09:00
79b5e82b3c Merge pull request #1705 from jsdalton/feature/external-pipeline-background-option Thomas Reynolds 2015-12-14 09:50:04 -08:00
f3296815c8 Add explicit option to prevent external option from running in background Jim Dalton 2015-12-13 22:12:11 -08:00
4122bd7351 Add back compass sprite prerender step Thomas Reynolds 2015-12-13 14:30:10 -08:00
defa6daa6d pt 3 Thomas Reynolds 2015-12-13 14:19:33 -08:00
82220eab4e fix git issue pt 2 Thomas Reynolds 2015-12-13 14:19:05 -08:00
3c1d28ce1b fix git issue pt 1 Thomas Reynolds 2015-12-13 14:18:54 -08:00
01f899f529 Print a failing build so I can debug on travis Thomas Reynolds 2015-12-13 13:59:44 -08:00
b6befd3fc3 Rubocop and disable an annoying test Thomas Reynolds 2015-12-13 13:29:33 -08:00
bb0f11d002 CHANGELOG updates. [ci skip] Thomas Reynolds 2015-12-13 13:26:44 -08:00
28a0071be7 Rename langs to locales in i18n. Provide backwards compat. Closes #1652 Thomas Reynolds 2015-12-13 13:20:48 -08:00
76f591788e Change inline URL matcher to only match strings, not newlines. Fixes #1689 Thomas Reynolds 2015-12-13 13:06:05 -08:00
d3a5494062 Handle invalid URLs in rewriter. Fixed #1638 Thomas Reynolds 2015-12-13 12:32:21 -08:00
37845e89c0 Changelog [ci skip] v3.4.1 v3-stable Thomas Reynolds 2015-12-10 13:24:35 -08:00
9dc144e9f7 Disable stylus test Thomas Reynolds 2015-12-10 13:22:46 -08:00
658b28c337 Load directory over SSL Thomas Reynolds 2015-12-10 13:05:57 -08:00
2674981d0b Fix yesterday's bone-headed commit. again Thomas Reynolds 2015-12-09 17:08:58 -08:00
9b0b82c00b Fix yesterday's bone-headed commit Thomas Reynolds 2015-12-09 17:03:55 -08:00
cb6e8bcd95 Fix first-run issue with pipeline Thomas Reynolds 2015-12-08 14:46:03 -08:00
2178a755e2 Minor SassC load_paths fix v4.0.0.rc.2 Thomas Reynolds 2015-11-30 17:40:14 -08:00
7b3f5384e9 Add SassC message Thomas Reynolds 2015-11-30 17:29:46 -08:00
07a216d5ca Remove sprockets/compass references Thomas Reynolds 2015-11-30 17:14:02 -08:00
e9b3a8abe4 Bump another Thomas Reynolds 2015-11-30 16:59:15 -08:00
578ff18fa0 Bump some deps Thomas Reynolds 2015-11-30 16:58:17 -08:00
ae15d203a8 Fix some tests Thomas Reynolds 2015-11-28 19:32:45 -08:00
e47b0ae29a import_file and import_path APIs. Addresses #1632 Thomas Reynolds 2015-11-28 18:02:45 -08:00
16b997498b Generic related files check Thomas Reynolds 2015-11-28 16:48:08 -08:00
a546e0f523 See if that fixes travis Thomas Reynolds 2015-11-28 14:51:37 -08:00
f2db1567a4 Use SassC in tests Thomas Reynolds 2015-11-27 16:19:26 -08:00
309733b067 Disable Travis OSX again... Thomas Reynolds 2015-11-27 15:47:32 -08:00
6de88a832e Make Ruby Sass the default, but use SassC if available. Addresses #1648 Thomas Reynolds 2015-11-27 15:41:42 -08:00
67f612a082 Merge pull request #1555 from skybon/patch-1 Thomas Reynolds 2015-11-27 15:31:35 -08:00
b4697e4541 Merge pull request #1696 from zacps/patch-1 Thomas Reynolds 2015-11-27 15:27:04 -08:00
dd0ee24ca3 Work around Listen :only weirdness. Addresses #1637 Thomas Reynolds 2015-11-27 15:26:46 -08:00
e23bd151bf Added rubyinstaller-devkit dependency for windows. Zac Pullar-Strecker 2015-11-28 12:16:13 +13:00
822a9f0ecc Fix layout detection on non-html files Thomas Reynolds 2015-11-27 14:26:34 -08:00
4594f46fb8 Minor tweak to #1695 Thomas Reynolds 2015-11-27 14:16:55 -08:00
18b12eedcf Merge pull request #1679 from dg-ratiodata/feature/upgrade_aruba Thomas Reynolds 2015-11-27 14:12:16 -08:00
b0582bcebf Merge pull request #1695 from johnnyshields/fix-sass-livereload-master Thomas Reynolds 2015-11-27 13:55:15 -08:00
13a14d43d4 In SourceWatcher, add a subroutine to find files which should be considered "also dirty" when a given file is touched. Johnny Shields 2015-11-27 15:20:20 +09:00
45939e7e93 Merge pull request #1687 from stevenosloan/allow_asset_url_to_work_without_a_resource Thomas Reynolds 2015-11-13 17:33:57 -08:00
6ab6669456 fix(Util::asset_url): allow use without passing a current_resource Steven Sloan 2015-11-13 16:42:08 -05:00
49a7435dc9 spec(Util::asset_url): add specs covering each conditional branch Steven Sloan 2015-11-13 16:37:58 -05:00
f16fc2229e feat(testing): add a fixture/file helper for rspec tests Steven Sloan 2015-11-13 16:33:59 -05:00
fe74824651 Merge pull request #1686 from stevenosloan/allow_asset_url_to_work_outside_of_a_resource Thomas Reynolds 2015-11-13 10:35:06 -08:00
30335091c8 fix(default_helpers): allow asset_url to work outside of a resource context Steven Sloan 2015-11-12 15:27:26 -05:00
37d96a9b14 Adapt to style changes and removal of on Thomas Reynolds 2015-11-11 15:30:26 -08:00
169b6f2c0a Merge pull request #1683 from maxmeyer/feature/preview_server_daemon Thomas Reynolds 2015-11-11 15:11:37 -08:00
fbf77d2ad2 Merge pull request #1684 from maxmeyer/patch-2 Thomas Reynolds 2015-11-11 15:11:29 -08:00
022779ef27 Add warning for master as well Dennis Günnewig 2015-11-11 23:30:49 +01:00
ce998cf685 Add changelog entry Dennis Günnewig 2015-11-11 22:27:43 +01:00
8c7e156bd4 Make middleman's preview server a daemon Dennis Günnewig 2015-11-11 22:20:37 +01:00
fe4d3a4bb3 Merge pull request #1681 from maxmeyer/feature/server_hook_v3 Thomas Reynolds 2015-11-11 13:49:57 -08:00
916a5a508b fix some tests Thomas Reynolds 2015-11-11 13:46:09 -08:00
78fb92d497 Adapt to upstream hooks API change. Fixes #1658 Thomas Reynolds 2015-11-11 13:14:31 -08:00
b4457c98d2 Merge pull request #1647 from middleman/frontmatter_delims Thomas Reynolds 2015-11-11 13:20:15 -08:00
e86110f506 Merge pull request #1680 from maxmeyer/patch-1 Thomas Reynolds 2015-11-11 13:18:46 -08:00
684a80c906 Change no-layout to the default, except for .html Thomas Reynolds 2015-11-11 12:58:07 -08:00
2ee07bdcb6 Update CONTRIBUTING.md Dennis Günnewig 2015-11-11 21:52:28 +01:00
02d25ee883 Add warning to contributing.md Dennis Günnewig 2015-11-11 21:51:35 +01:00
4e9ae8cc42 Before server hook Dennis Günnewig 2015-11-11 21:49:37 +01:00
1d2126b9f7 Move HTTPS to server information Dennis Günnewig 2015-11-11 21:39:54 +01:00