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
62b17d38ad
Merge pull request #1734 from GhostGambler/issue-1702
...
Issue #1702
2016-01-05 09:50:41 -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
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
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
jordanandree
e035d625c8
skip front matter on ingored resources
2015-12-17 14:01:37 -05:00
Thomas Reynolds
b2b461935d
Here we go
2015-12-15 19:58:04 -08:00
Thomas Reynolds
9e5b137ed8
Really fix #1689
2015-12-15 09:58:22 -08:00
Thomas Reynolds
6af784d5d5
One more RC
2015-12-14 11:02:07 -08:00
Thomas Reynolds
0e620a1ba1
Resolve Contracts warning
2015-12-14 10:22:27 -08:00
Johnny Shields
308ea6db5a
Include :locales and :data in live-reloadable types
2015-12-14 09:51:25 -08:00
Jim Dalton
f3296815c8
Add explicit option to prevent external option from running in background
2015-12-13 22:12:11 -08:00
Thomas Reynolds
4122bd7351
Add back compass sprite prerender step
2015-12-13 14:30:10 -08:00
Thomas Reynolds
defa6daa6d
pt 3
2015-12-13 14:19:33 -08:00
Thomas Reynolds
82220eab4e
fix git issue pt 2
2015-12-13 14:19:05 -08:00
Thomas Reynolds
3c1d28ce1b
fix git issue pt 1
2015-12-13 14:18:54 -08:00
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
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
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
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
6de88a832e
Make Ruby Sass the default, but use SassC if available. Addresses #1648
2015-11-27 15:41:42 -08:00
Thomas Reynolds
dd0ee24ca3
Work around Listen :only weirdness. Addresses #1637
2015-11-27 15:26:46 -08: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
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
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
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
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
Dan Allen
c48c81cbba
resolves #1656 don't mangle URL inside tag
2015-10-26 15:30:44 -06:00
Dan Allen
4995bd23d7
resolves #1653 don't rewrite paths that start with //
2015-10-26 00:39:48 -06:00
Eliott Appleford
19d21d2295
make frontmatter delims configurable
2015-10-23 09:40:24 +00:00
Thomas Reynolds
3cd84eb4d1
move_file as a replacement for import_asset
2015-10-22 20:23:39 -07:00
Thomas Reynolds
62d7fa0676
remove unused file
2015-10-12 12:37:42 -07:00
Thomas Reynolds
d2251de898
Bump Padrino
2015-10-12 12:37:33 -07:00
Thomas Reynolds
6357f4f5b8
Add back app.set, but mark as deprecated
2015-10-12 12:37:07 -07:00
Thomas Reynolds
eb82f402a0
gem bumps
2015-10-05 09:48:17 -07:00
yuuji.yaginuma
e26f83e1c2
remove unnecessary require
...
`require 'rubygems'` is already required in Ruby 1.9 or later.
2015-10-04 07:24:21 +09:00
Thomas Reynolds
e9abfe1134
rubocop
2015-10-01 13:54:54 -07:00
inoue_sachiro
67fc3d0c05
Fix: Can't clean files when the project is under a hidden directory.
2015-10-01 13:54:45 -07:00
Thomas Reynolds
fd6a2376bd
Fix frontmatter on 2.0
2015-10-01 10:25:53 -07:00
Thomas Reynolds
d828067189
Fix sass helpers in SassC context
2015-09-30 11:16:57 -07:00
Thomas Reynolds
0698d7f5aa
Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression"
...
This reverts commit 5e3ddbf988
2015-09-30 10:24:12 -07:00
Eliott Appleford
b389c26b4e
Fix frontmatter regex
2015-09-30 04:58:59 +00:00
Eliott Appleford
9df1a45301
Strip newline after frontmatter
...
Closes #1610
2015-09-30 05:00:57 +01:00
Thomas Reynolds
5e3ddbf988
Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression
2015-09-29 10:27:53 -07:00
Thomas Reynolds
d9fc7a95e1
Fix a bad i18n regression
2015-09-28 14:52:16 -07:00
Thomas Reynolds
04c133c90f
Fix minify css tests
2015-09-28 13:58:49 -07:00
Thomas Reynolds
32891dc6fe
SassC, woot
2015-09-28 11:24:37 -07:00
Eliott Appleford
97cd1c1411
Fix JSON frontmatter parsing
2015-09-24 20:27:36 +01:00
Thomas Reynolds
fe66beacc3
Test fix WIP
2015-09-23 16:20:16 -07:00
Eliott Appleford
ddc4a3cabc
Update data.rb
2015-09-23 23:40:42 +01:00
Eliott Appleford
47bdcb2d9c
Fix frontmatter parsing changes from #1608
...
Only allow frontmatter at the top of the page:
Now manually removing encoding lines as before
Fix handling of postscript data:
If there is no frontmatter and the filetype is known,
parse the whole file
Allow empty frontmatter
Update the documentation comments
2015-09-23 21:45:52 +00:00
Eliott Appleford
11fc90f93c
Merge pull request #1604 from middleman/frontmatter
...
Refactor frontmatter parsing
2015-09-21 13:33:43 +01:00
Eliott Appleford
91a06a1a35
Refactor util/data.rb further
2015-09-20 12:34:15 +00:00
Eliott Appleford
62f431b5ae
Refactor frontmatter parsing
...
Closes #1603
2015-09-20 12:24:48 +00:00
Thomas Reynolds
d3d32731e1
more test fixes
2015-09-19 16:00:38 -07:00
Thomas Reynolds
765de5ab11
Remove ancient twitter bootstrap test. Use npm or bower, y'all
2015-09-19 14:39:55 -07:00
Thomas Reynolds
3e1fc0aa1f
Change test to respect global relative assets change
2015-09-19 14:26:30 -07:00
Thomas Reynolds
3ae28874bf
Fix test breakage
2015-09-19 14:07:42 -07:00
Thomas Reynolds
2907761556
tweak logger ref
2015-09-17 14:46:27 -07:00
Thomas Reynolds
fdabd87957
merge in fixes from stable
2015-09-17 13:53:43 -07:00
Thomas Reynolds
409a892da7
Forward port some stable changes
2015-09-17 09:41:17 -07:00
Thomas Reynolds
a251c82562
Add test for #1568
2015-09-17 09:25:04 -07:00
Thomas Reynolds
8c02eb2a26
Some tweaks to get blog working
2015-09-14 17:37:35 -07:00
Thomas Reynolds
40f023f01c
Let's do this
2015-09-12 16:15:32 -07:00
Thomas Reynolds
441dc2faa6
Revert breaking resource source_file api. For #1595
2015-09-09 11:55:56 -07:00
Rafał Komorowski
0d4d82a01a
Update middleman-livereload version to more current
...
As discussed https://github.com/middleman/middleman-livereload/issues/69 but I forgot to apply the fix to source code inside MM. @tdreyno, should it be `~> 3.3.0` or `~> 3.4.0`? I looked into 3.4 changes and they seem to be MM v4 related?
2015-09-03 18:25:43 +02:00
Thomas Reynolds
d849930e51
Don't set mode AND environment with the same ENV
2015-09-01 09:58:13 -07:00
Thomas Reynolds
5cab7c46a9
Store intermediate resources in reducer so the array is not empty the first run. Addresses #1590
2015-08-31 11:18:45 -07:00
Brad Gessler
8bdeab50ee
Fix typo in server CLI.
2015-08-28 13:08:56 -07:00
Thomas Reynolds
f76561d101
Add logger require in rack. Addresses #1550
2015-08-28 09:58:10 -07:00
Thomas Reynolds
9ed0796b4a
Move some extension setup to ready event
2015-08-20 17:45:18 -07:00
Thomas Reynolds
3485f49f74
Use Hashie Mash for recursive indifferent
2015-08-18 16:22:32 -07:00
