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

1458 commits

Author SHA1 Message Date
Thomas Reynolds
e8f10fe3c2 prep 2016-05-31 13:15:37 -07:00
Thomas Reynolds
1efa585c11 Fix #1866 2016-05-31 13:15:37 -07:00
Shawn Van Ittersum
0d5c9e4313 Prevent overwrite of Slim embedded options (#1927) 
* Fix middleman/middleman#1925: Slim embedded options overwrite

* Remove context_hack from Slim renderer

* Remove debugging output
 2016-05-31 13:15:21 -07:00
Thomas Reynolds
51ccfe1143 only encode if current path is broken 2016-05-25 11:25:24 -07:00
Thomas Reynolds
4ffaa9dde5 Try to encode URI before parsing so spaces in paths work. Fixes #1914 2016-05-25 11:13:59 -07:00
Thomas Reynolds
6440d53e7a Add support for dotenv 2016-05-25 10:54:49 -07:00
Ben Hollis
38a9025560 Fix asset_url with asset_hash (#1919) 
* Fix asset_url with asset_hash.

* Fix asset hashes.
 2016-05-22 12:31:53 -07:00
Steven Sloan
5de9e86a55 allow partial lookups without a current_resource (#1912) 
current_resource is only needed for relative lookups, so for lookups from source allow them to run without a current resource.
 2016-05-13 13:01:21 -07:00
Thomas Reynolds
ccc1cc1288 Fix ordering in tests 2016-05-11 11:48:21 -07:00
Thomas Reynolds
849fc65260 prep 2016-05-11 10:59:48 -07:00
Matthew Lehner
3e4187568b require the try core extension (#1911) 2016-05-10 15:17:28 -07:00
PiotrMisiurek
1c57626445 Fix contract for Sitemap::Store.register_resource_list_manipulator (#1907) 
Contract said that optional param priority can be only a number.
But the code also handle the boolean as a value to be compatibile
with old versions

Change contract to accept both Num and Bool
 2016-05-06 00:12:03 -07:00
Steven Sloan
cf4d40caff loosen contract on Resource#source_file to Maybe[String] (#1906) 
this could legitimately return nil if there is no file_descriptor, as would be the case for a StringResource
 2016-05-05 09:08:29 -07:00
Thomas Reynolds
3ebd902ec3 Move capybara dep 2016-04-28 15:44:50 -07:00
Thomas Reynolds
cdcd2bd42d Expose development? and production? helpers to template context. Related #1895 2016-04-26 09:24:49 -07:00
Thomas Bruketta
4918704800 Allow numbers to be unique page_ids (#1886) 2016-04-25 09:51:11 -07:00
Nick Giancola
8a8ee768ac Fix/issue 1889 (#1892) 
* Add regression test for infinite loop issue in Util::step_through_extensions (#1889)

* Prevent infinite loop when encountering files where base filename is a possible templating engine
 2016-04-25 09:50:51 -07:00
Daniel Bayerlein
ce58073539 Incompatibility of listen with Ruby < 2.2 fixed 2016-04-24 09:57:13 +02:00
Thomas Reynolds
13d62cb276 Experiment with non-rack rewriters 2016-04-22 15:52:42 -07:00
Thomas Reynolds
0f2bc1e0ea Minor perf tweaks 2016-04-21 16:12:33 -07:00
Thomas Reynolds
2b0f720850 Bad merge 2016-04-19 11:54:00 -07:00
Thomas Reynolds
b386dcdc40 Fix #1884 for realz 2016-04-19 11:08:23 -07:00
Thomas Reynolds
0ac5650229 Throw when trying to overwrite a template context value. Fixes #1884 2016-04-19 11:06:51 -07:00
Thomas Reynolds
7e3baed196 Throw when trying to overwrite a template context value. Fixes #1884 2016-04-19 10:37:23 -07:00
Thomas Reynolds
09a7d89fd3 Throw when trying to overwrite a template context value. Fixes #1884 2016-04-19 10:36:49 -07:00
Thomas Reynolds
6872e07d34 Expose extensions in config. Helps middleman/middleman-sprockets#111 2016-04-17 13:02:23 -07:00
Thomas Reynolds
a01656df39 Steps should try passing unknown methods to config context before failing. Fixes #1879 2016-04-14 11:30:46 -07:00
Thomas Reynolds
f2535f4fda Bump dep 2016-04-13 09:23:28 -07:00
Thomas Reynolds
dd2413857e prep 2016-04-12 13:12:09 -07:00
Thomas Reynolds
b058d26564 Bump fast image 2016-04-12 13:05:46 -07:00
Thomas Reynolds
b794961916 Only rewrite urls in sitemap. Fixes #1873 2016-04-12 12:53:50 -07:00
Thomas Reynolds
ac974ca05f Allow restarting external-pipeline without orphaning processes 2016-04-12 10:00:09 -07:00
Thomas Reynolds
e99649b33e Make global config access work inside steps 2016-04-11 16:02:31 -07: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
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