Commit graph

3040 commits

Author SHA1 Message Date
FearGoidte
d863733160 Merge remote-tracking branch 'origin/master' 2016-01-28 08:18:35 +00:00
FearGoidte
13c351f2bf Merge remote-tracking branch 'middleman/master' 2016-01-28 08:18:25 +00:00
James
17f5f19002 Merge branch 'master' into master 2016-01-28 08:18:01 +00:00
FearGoidte
007c626d58 .xml removed from Gzip defaults 2016-01-28 08:16:23 +00:00
Thomas Reynolds
e169d3d07e Merge pull request #1782 from jsdalton/allow-watcher-disable-in-server-mode
Disable file watching completely when watcher_disable is true
2016-01-28 00:05:40 -08: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
Thomas Reynolds
24ef35026e Merge pull request #1779 from bhollis/minify-js
Minify inline JS when there are other attributes.
2016-01-25 10:11:09 -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
4deaa65a6d update donate link 2016-01-23 17:14:35 -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
Thomas Reynolds
8bacc35bf2 Merge pull request #1770 from jsdalton/add-mm-data-dir-env-var
Add option for MM_DATA_DIR env var to define :data_dir default value
2016-01-21 10:06:55 -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
6077ae43e9 rejigger cop 2016-01-19 15:35:37 -08:00
Thomas Reynolds
65aebc1887 Move some tests around 2016-01-19 14:55:47 -08:00
Thomas Reynolds
801a83f7cb Update changelog 2016-01-19 09:46:55 -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
Thomas Reynolds
732ac7cbe9 Merge pull request #1762 from jsdalton/fix-removed-paths-type
Use correct type for removed paths passed to update
2016-01-16 18:49:01 -08: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
5529062bc4 Changelog 2016-01-14 14:31:00 -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
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