Thomas Reynolds
3cbd9fdede
Add back plain environment helper to context. Helps with #1861
2016-03-25 10:23:05 -07:00
Thomas Reynolds
7ae8e904a6
Merge pull request #1862 from balthisar/server_cli_fix
...
Fix server CLI
2016-03-25 10:17:25 -07:00
Thomas Reynolds
55230229f6
Fix #1857
2016-03-25 10:16:54 -07:00
Jim Derry
9e774b608a
Fix server CLI
2016-03-25 14:00:48 +08:00
Thomas Reynolds
b950af89ac
Really prep
2016-03-22 16:04:00 -07:00
Thomas Reynolds
5a2f9c8ca6
Create a single default list of asset extensions. Add .ico to it. Fixes #1830 .
2016-03-22 15:43:48 -07:00
Thomas Reynolds
bca8b854dd
prep
2016-03-22 12:34:03 -07:00
Brad Gessler
179d6c0be4
Add extensions to asset_host extension.
2016-03-22 11:22:06 -07:00
Adam Heath
025e35f6a1
Fix asset_hash with content rule and uncommented CSS url
...
Fixes middleman/middleman#1852
2016-03-22 17:34:40 +08:00
FearGoidte
d461473f81
Added .xhtml
...
Fixes pretty U.R.L.s for xhtml files
2016-03-21 15:19:36 +00:00
Thomas Reynolds
8425692b86
Try to fix preview server config
2016-03-20 17:33:44 -07:00
Thomas Reynolds
aab7bac8a6
Apply CLI options later in process. Fixes 1843
2016-03-20 16:44:20 -07:00
Thomas Reynolds
7e42954258
Define a :config mode, dont run external pipeline on config mode. Fixes #1844
2016-03-20 16:31:15 -07:00
Gregory McIntyre
d539d4aa3d
Merge branch 'master' into fix/asset-url-and-relative-paths
2016-03-19 16:04:44 +11:00
Gregory McIntyre
0436c211c6
Fix asset_url and relative option bug.
...
If the relative option is set and the asset is stored in the directory
alongside the resource referencing it, asset_url produces the
wrong path ('../images/image.jpg' rather than just 'image.jpg').
2016-03-19 13:42:41 +11:00
Thomas Reynolds
d22bd914ae
Add specific test for #1556
2016-03-18 10:37:02 -07:00
Thomas Reynolds
dfa389bde4
bump
2016-03-17 14:47:14 -07:00
Thomas Reynolds
5337d0640b
Allow skipping sitemap. Helps #1837
2016-03-17 13:23:36 -07:00
Gregory McIntyre
563da9d45b
Fix bug with store rebuilding and proxy resources.
2016-03-16 12:22:13 +11:00
Thomas Reynolds
0904652c6f
Try to fix #1832
2016-03-15 14:10:27 -07:00
Thomas Reynolds
1f3bf47e3c
Expose all config options to CLIs. Helps with #1829
2016-03-12 13:55:25 -08:00
Thomas Reynolds
d624dc4601
Refine gemspec
2016-03-10 13:17:44 -08:00
Greg Tarsa
fbc572f920
Ensure that misspelled or missing partials generate an error
2016-03-03 11:23:17 -05:00
Thomas Reynolds
737e6f5e64
expand_path on custom source directories. Fixes #1823
2016-03-02 12:54:14 -08:00
Thomas Reynolds
7b59f240d5
Fixes #1821
2016-03-02 12:00:39 -08:00
Thomas Reynolds
c44f7482b1
Fix #1822
2016-03-01 09:25:05 -08:00
Thomas Reynolds
e14107ba65
prep v4.1.2
2016-02-28 20:17:35 -08:00
Adam Heath
d883152e99
Add sourceMap comment to asset_hash and hash .map files by default
2016-02-26 08:46:00 +08:00
Thomas Reynolds
0d983231d0
Run helper after collections. Fixes #1226
2016-02-24 14:20:42 -08:00
Thomas Reynolds
4733488e8d
Update deps
2016-02-24 13:14:50 -08:00
Thomas Reynolds
edb1a53060
Add page_id concept
2016-02-22 11:17:21 -08:00
Thomas Reynolds
b695f6da1e
Fix #1028
2016-02-19 13:24:16 -08:00
Adam Heath
351003b4fe
Make build fail when external_pipeline fails
2016-02-18 12:41:48 +08:00
Steven Sloan
fc0f5d24d6
feat(data): allow for setting & getting Arrays through #store & #data_for_path
...
Seeing that in #touch_file that a value in data could be an Array or Hash, loosen contracts to allow for other storage & retrieval methods to set the same types. Array & Hash being allowable is strongly tied to what *could* be returned after passing through Util.recursively_enhance
[close #1803 ]
2016-02-17 17:20:24 -05:00
Melvin Lammerts
b7886aa14c
escape path in 404 (not found) page
...
This escapes the `path` variable using `escape_html` from `Rack::Utils` to prevent Cross-Site Scripting in 404 (Not Found) pages.
2016-02-15 23:42:05 +01:00
Jim Cushing
7bd417fad1
show version on middleman page
2016-02-04 20:44:39 -05:00
Jim Cushing
b1778a92cd
fix partials used with blocks
2016-02-03 16:56:12 -05:00
Thomas Reynolds
a2181a2fd9
Allow findup to be false
2016-02-03 09:57:30 -08:00
Thomas Reynolds
6de25dfd0e
Fix #1787
2016-02-02 18:49:14 -08:00
Thomas Reynolds
f596d8ebf5
bump
2016-02-02 13:11:53 -08:00
Thomas Reynolds
3f18efeed9
split up util module, fix some rubocop complaints
2016-01-31 14:13:52 -08:00
Thomas Reynolds
c5aabbbe4f
Confirm nested frontmatter doesn't work
2016-01-29 10:30:08 -08:00
Thomas Reynolds
598d72480f
Fix slow server boot. It was recursing through node_modules and .git on initial boot
2016-01-28 16:45:54 -08:00
FearGoidte
13c351f2bf
Merge remote-tracking branch 'middleman/master'
2016-01-28 08:18:25 +00:00
FearGoidte
007c626d58
.xml removed from Gzip defaults
2016-01-28 08:16:23 +00:00
Jim Dalton
cc36267de5
Disable file watching completely when watcher_disable is true
2016-01-27 20:56:17 -08:00
FearGoidte
475fa41de0
Support for .xhtml
...
I’ve attempted to make support for .htm and .xhtml consistent.
Extensions are in alphabetical order to make it easier to compare them.
2016-01-27 09:48:36 +00:00
Thomas Reynolds
2bba7888b0
Fixes #1780
2016-01-26 13:47:27 -08:00
Thomas Reynolds
0c29fd4abf
Make templates extensions with layouts configurable
2016-01-26 13:21:39 -08:00
Thomas Reynolds
9553796731
Fix passing template locals down to partials. Helps #1753
2016-01-26 11:01:32 -08:00
Ben Hollis
8881389b42
Minify inline JS when there are other attributes.
2016-01-24 22:55:48 -08:00
Thomas Reynolds
e7d9c8ad0e
Fix a threading issue caused by parallel
2016-01-24 13:02:39 -08:00
Thomas Reynolds
deae5d2216
Fix #1778
2016-01-24 12:30:53 -08:00
Thomas Reynolds
c7a4618166
Perf work and Parallel builds
2016-01-22 15:57:07 -08:00
Thomas Reynolds
b8c0fd34e7
additional perf work
2016-01-22 14:25:02 -08:00
Thomas Reynolds
e0818e2118
remove debug code
2016-01-21 14:47:45 -08:00
Thomas Reynolds
4e8273295b
tweak some checksums, something slightly changed file output upstream
2016-01-21 10:50:44 -08:00
Thomas Reynolds
92d96f6604
typo
2016-01-21 10:19:52 -08:00
Jim Dalton
68127003b9
Add option for MM_DATA_DIR env var to define :data_dir default value
2016-01-20 21:11:03 -08:00
Thomas Reynolds
5586784947
Add some options to watcher to opt out of features later
2016-01-20 13:34:12 -08:00
Thomas Reynolds
6d1c3562a7
Differentiate polling from find_new_files to remove double reads in build mode
2016-01-20 12:20:27 -08:00
Thomas Reynolds
ffa662a917
Add system-wide file read cache
2016-01-20 11:50:25 -08:00
Thomas Reynolds
827d5fbb1d
Still parse frontmatter on ignored resources. Proxies need it
2016-01-20 10:42:12 -08:00
Thomas Reynolds
2864902fa0
Fix #1767
2016-01-20 10:02:19 -08:00
Thomas Reynolds
65aebc1887
Move some tests around
2016-01-19 14:55:47 -08:00
Thomas Reynolds
c2999786ee
Merge pull request #1763 from iiska/fix-gzip-log-output
...
Fix gzip extension status output
2016-01-19 09:45:47 -08:00
Thomas Reynolds
2b88773640
Fix contract in i18n. Closes #1764
2016-01-19 09:44:56 -08:00
Thomas Reynolds
7bf4e4681f
Show an error message when git CLI is not available. Closes #1765
2016-01-19 09:43:40 -08:00
Juhamatti Niemelä
22812cb340
Fix gzip extension status output
2016-01-18 19:55:45 +02:00
Jim Dalton
dc3eac9e96
Use correct type for removed paths passed to update
2016-01-16 11:58:00 -08:00
Thomas Reynolds
03c95f0863
prep
2016-01-14 14:48:40 -08:00
Thomas Reynolds
a47b2138f8
Add specific check for TLD-like strings when replacing inline urls. Fixes #1751
2016-01-14 14:29:45 -08:00
Thomas Reynolds
be2788b6ca
Fix automatic images with absolute (or images dir missing) paths in markdown. Fixes #1755
2016-01-14 14:14:50 -08:00
Thomas Reynolds
ff9c34bca9
Allow sorting of rewriters. Fixes #1752
2016-01-14 14:02:33 -08:00
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
95c7a53291
Convert more basic config commands to ConfigExtensions
2016-01-12 10:38:53 -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
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
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
Nathan Feaver
17df162e7b
consider all MS Office files to be binary
2016-01-10 06:28:18 -07: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
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
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
