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

3109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds
4791e01f10 Merge pull request #1877 from middleman/bugfix/restarting-external-pipeline 
Allow restarting external-pipeline without orphaning processes
 2016-04-12 10:23:38 -07:00
Thomas Reynolds
ac974ca05f Allow restarting external-pipeline without orphaning processes 2016-04-12 10:00:09 -07:00
Thomas Reynolds
c7669609e6 Merge pull request #1876 from middleman/bugfix/global-collection-steps 
Make global config access work inside steps
 2016-04-11 16:23:07 -07:00
Thomas Reynolds
e99649b33e Make global config access work inside steps 2016-04-11 16:02:31 -07:00
Thomas Reynolds
ec213efb95 Merge pull request #1871 from luskjh/sprockets-readme-link-change 
Update link in README to sprockets repository.
 2016-04-08 13:39:57 -05:00
Joshua Lusk
21f4f40e21 Update README.md 2016-04-06 12:37:15 -04:00
Thomas Reynolds
16c82fe57a Really fix #1864 2016-03-27 14:12:32 -07:00
Thomas Reynolds
058a63a0de Make #1831 work 2016-03-26 16:43:47 -07:00
Thomas Reynolds
49da6156a0 Fixes #1860 2016-03-26 15:17:09 -07:00
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
Thomas Reynolds
ebc2baa13f Merge pull request #1855 from bradgessler/asset-host-extensions 
Add exts to asset_host extension
 2016-03-22 12:11:01 -07:00
Brad Gessler
179d6c0be4 Add extensions to asset_host extension. 2016-03-22 11:22:06 -07:00
Thomas Reynolds
2701bede2a Merge pull request #1851 from FearGoidte/master 
Typo reversed meaning
 2016-03-22 11:04:36 -07:00
James
cc25c784f9 Merge branch 'master' into master 2016-03-22 17:35:21 +00:00
Thomas Reynolds
9d29cd58de Merge pull request #1853 from adam-h/asset-hash-1852 
Fix asset_hash with content rule and uncommented CSS url
 2016-03-22 10:09:53 -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
f5a668d380 Typo reversed meaning 2016-03-22 08:24:21 +00:00
Thomas Reynolds
0df7f0d6ac Merge pull request #1847 from FearGoidte/master 
Added .xhtml
 2016-03-21 12:02:19 -07: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
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