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

3083 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thomas Reynolds
02a0b557f6 Merge pull request #1842 from puyo/fix/asset-url-and-relative-paths 
Fix asset_url and relative option bug.
 2016-03-20 16:06:47 -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
Thomas Reynolds
7484c9f242 Merge pull request #1836 from puyo/fix-proxy-metadata-lookup-during-store-rebuild 
Fix bug with store rebuilding and proxy resources.
 2016-03-16 10:15:20 -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
Thomas Reynolds
260a9cd94c Merge pull request #1826 from gltarsa/flag-missing-partial 
Ensure that misspelled or missing partials generate an error
 2016-03-03 09:05:24 -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
Thomas Reynolds
d776f07bfc Merge pull request #1815 from adam-h/sourcemap-hashing 
Add sourceMap comment to asset_hash and hash .map files by default
 2016-02-26 10:09:18 -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
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