deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3058 commits 11 branches 271 tags 23 MiB
Commit graph

3058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds
e36fd3f476 move contrib file 2016-02-19 11:26:15 -08:00
Thomas Reynolds
eaac03ab4b Merge pull request #1809 from adam-h/external-pipeline-error 
Make build fail when external_pipeline fails
 2016-02-18 12:48:02 -08:00
Adam Heath
351003b4fe Make build fail when external_pipeline fails 2016-02-18 12:41:48 +08:00
Thomas Reynolds
476287452d Merge pull request #1808 from stevenosloan/loosen_data_store_contracts 
loosen contracts for setting/returning data in Datastore
 2016-02-17 15:06:53 -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
Thomas Reynolds
a24e5986a2 Merge pull request #1805 from melvinsh/fix_404_html_injection 
Escape path in 404 (not found) page
 2016-02-16 09:28:07 -08: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
Thomas Reynolds
6c8fc2ee07 Merge pull request #1792 from jimothyGator/feature/show-version-on-middleman-page 
show version on Middleman Information page
 2016-02-04 22:58:26 -08:00
Jim Cushing
7bd417fad1 show version on middleman page 2016-02-04 20:44:39 -05:00
Thomas Reynolds
d7967a86bb Merge pull request #1791 from jimothyGator/fix/1790-blocks-with-partials 
fix partials used with blocks
 2016-02-04 08:53:09 -08: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
Thomas Reynolds
8c27d9a2e7 Merge pull request #1781 from FearGoidte/master 
Support for .xhtml
 2016-01-28 10:50:39 -08:00
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