Thomas Reynolds
01f899f529
Print a failing build so I can debug on travis
2015-12-13 13:59:44 -08:00
Thomas Reynolds
b6befd3fc3
Rubocop and disable an annoying test
2015-12-13 13:29:33 -08:00
Thomas Reynolds
bb0f11d002
CHANGELOG updates. [ci skip]
2015-12-13 13:26:44 -08:00
Thomas Reynolds
28a0071be7
Rename langs to locales in i18n. Provide backwards compat. Closes #1652
2015-12-13 13:20:48 -08:00
Thomas Reynolds
76f591788e
Change inline URL matcher to only match strings, not newlines. Fixes #1689
2015-12-13 13:06:05 -08:00
Thomas Reynolds
d3a5494062
Handle invalid URLs in rewriter. Fixed #1638
2015-12-13 12:32:21 -08:00
Thomas Reynolds
658b28c337
Load directory over SSL
2015-12-10 13:05:57 -08:00
Thomas Reynolds
2674981d0b
Fix yesterday's bone-headed commit. again
2015-12-09 17:08:58 -08:00
Thomas Reynolds
9b0b82c00b
Fix yesterday's bone-headed commit
2015-12-09 17:03:55 -08:00
Thomas Reynolds
cb6e8bcd95
Fix first-run issue with pipeline
2015-12-08 14:46:03 -08:00
Thomas Reynolds
2178a755e2
Minor SassC load_paths fix
2015-11-30 17:40:14 -08:00
Thomas Reynolds
7b3f5384e9
Add SassC message
2015-11-30 17:29:46 -08:00
Thomas Reynolds
07a216d5ca
Remove sprockets/compass references
2015-11-30 17:14:02 -08:00
Thomas Reynolds
e9b3a8abe4
Bump another
2015-11-30 16:59:15 -08:00
Thomas Reynolds
578ff18fa0
Bump some deps
2015-11-30 16:58:17 -08:00
Thomas Reynolds
ae15d203a8
Fix some tests
2015-11-28 19:32:45 -08:00
Thomas Reynolds
e47b0ae29a
import_file and import_path APIs. Addresses #1632
2015-11-28 18:03:05 -08:00
Thomas Reynolds
16b997498b
Generic related files check
2015-11-28 16:48:08 -08:00
Thomas Reynolds
a546e0f523
See if that fixes travis
2015-11-28 14:51:37 -08:00
Thomas Reynolds
f2db1567a4
Use SassC in tests
2015-11-27 16:19:26 -08:00
Thomas Reynolds
309733b067
Disable Travis OSX again...
2015-11-27 15:47:32 -08:00
Thomas Reynolds
6de88a832e
Make Ruby Sass the default, but use SassC if available. Addresses #1648
2015-11-27 15:41:42 -08:00
Thomas Reynolds
b4697e4541
Merge pull request #1696 from zacps/patch-1
...
Added rubyinstaller-devkit dependency for windows.
2015-11-27 15:27:04 -08:00
Thomas Reynolds
dd0ee24ca3
Work around Listen :only weirdness. Addresses #1637
2015-11-27 15:26:46 -08:00
Zac Pullar-Strecker
e23bd151bf
Added rubyinstaller-devkit dependency for windows.
2015-11-28 12:16:13 +13:00
Thomas Reynolds
822a9f0ecc
Fix layout detection on non-html files
2015-11-27 14:26:34 -08:00
Thomas Reynolds
4594f46fb8
Minor tweak to #1695
2015-11-27 14:16:55 -08:00
Thomas Reynolds
b0582bcebf
Merge pull request #1695 from johnnyshields/fix-sass-livereload-master
...
Fix SASS partial live reloading
2015-11-27 13:55:15 -08:00
Johnny Shields
13a14d43d4
In SourceWatcher, add a subroutine to find files which should be considered "also dirty" when a given file is touched.
2015-11-27 15:20:20 +09:00
Thomas Reynolds
45939e7e93
Merge pull request #1687 from stevenosloan/allow_asset_url_to_work_without_a_resource
...
Allow asset url to work without passing a current_resource (v4)
2015-11-13 17:33:57 -08:00
Steven Sloan
6ab6669456
fix(Util::asset_url): allow use without passing a current_resource
...
Most cases the current_resource isn’t actually needed, so calls could be made
from extensions and still get the correct path back.
An exception will be raised with a descriptive message if the current_resource
is needed but not given. (for example, if relative is true — it needs a resource
to base the url on)
2015-11-13 16:48:52 -05:00
Steven Sloan
49a7435dc9
spec(Util::asset_url): add specs covering each conditional branch
2015-11-13 16:37:58 -05:00
Steven Sloan
f16fc2229e
feat(testing): add a fixture/file helper for rspec tests
2015-11-13 16:34:08 -05:00
Thomas Reynolds
37d96a9b14
Adapt to style changes and removal of on
2015-11-11 15:30:40 -08:00
Thomas Reynolds
169b6f2c0a
Merge pull request #1683 from maxmeyer/feature/preview_server_daemon
...
Make middleman's preview server a daemon
2015-11-11 15:11:37 -08:00
Thomas Reynolds
fbf77d2ad2
Merge pull request #1684 from maxmeyer/patch-2
...
Add warning for master as well
2015-11-11 15:11:29 -08:00
Dennis Günnewig
022779ef27
Add warning for master as well
2015-11-11 23:30:49 +01:00
Dennis Günnewig
ce998cf685
Add changelog entry
2015-11-11 23:28:38 +01:00
Dennis Günnewig
8c7e156bd4
Make middleman's preview server a daemon
2015-11-11 23:28:38 +01:00
Thomas Reynolds
916a5a508b
fix some tests
2015-11-11 13:46:09 -08:00
Thomas Reynolds
b4457c98d2
Merge pull request #1647 from middleman/frontmatter_delims
...
Frontmatter delims
2015-11-11 13:20:15 -08:00
Thomas Reynolds
684a80c906
Change no-layout to the default, except for .html
2015-11-11 12:58:07 -08:00
Thomas Reynolds
90490d696f
Merge pull request #1678 from maxmeyer/feature/server_hook
...
Add "before_server"-hook to preview server in v4
2015-11-11 12:26:22 -08:00
Dennis Günnewig
0f8ea86119
Add hook for before_server
2015-11-08 11:03:25 +01:00
Dennis Günnewig
a61b2e3b87
Move HTTPS to server_information
2015-11-07 18:50:55 +01:00
Thomas Reynolds
ec99a7b28f
Merge pull request #1657 from mojavelinux/issue-1656
...
resolves #1656 don't mangle URL inside tag
2015-10-26 14:52:30 -07:00
Dan Allen
c48c81cbba
resolves #1656 don't mangle URL inside tag
2015-10-26 15:30:44 -06:00
Thomas Reynolds
30e37293b3
Merge pull request #1655 from mojavelinux/issue-1653
...
resolves #1653 don't rewrite paths that start with //
2015-10-26 10:21:11 -07:00
Thomas Reynolds
765c28114a
Merge pull request #1654 from mojavelinux/patch-1
...
Ignore .ruby-gemset file
2015-10-26 10:20:13 -07:00
Dan Allen
4995bd23d7
resolves #1653 don't rewrite paths that start with //
2015-10-26 00:39:48 -06:00
