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

220 commits

Author SHA1 Message Date
Thomas Reynolds
c94e5d0f4d Merge from stable 2015-02-24 11:16:16 -08:00
Thomas Reynolds
a3772428c1 Merge pull request #1456 from yterajima/feature/add-template-test 
Add test to `$ middleman init` using tmeplate
 2015-02-23 12:30:11 -08:00
Ilya Vassilevsky
4d75ba7749 Fix grammar in a scenario 2015-02-23 01:53:14 +03:00
yterajima
ceb4769325 Add test to $ middleman init using tmeplate 
* using Middleman directory
* using github
    * user/repository
    * user/repository#branch
* using full path
    * contains "://"
 2015-02-19 01:02:21 +09:00
Thomas Reynolds
2f558ec571 Fix test 2015-02-13 14:39:08 -08:00
Thomas Reynolds
39c7c9df54 fix leftover flag 2015-01-04 15:28:13 -06:00
Thomas Reynolds
857c99fab5 attempt to fix interactive cli timeout 2015-01-04 15:23:37 -06:00
Thomas Reynolds
8e743aea94 fix interactive init test 2015-01-04 15:06:14 -06:00
Thomas Reynolds
f16510d034 Update CLI 2015-01-04 14:23:35 -06:00
Thomas Reynolds
302a891bbb Update some deps 2015-01-03 14:32:21 -06:00
Steven Sloan
85fa3fac02 add support for “sidecar” frontmatter at the destination url of proxied resources 
a “cheap” way to support adding data to pages created through `proxy` or `page` by adding frontmatter at the expected destination url.

for example proxying a page to `/proxied.html`, by adding a sidecar frontmatter file at `source/proxied.html.frontmatter` (or source/proxied.frontmatter if directory indexes is activated) the frontmatter will be merged with the proxy source and available to `current_resource` at the destination.
 2014-12-22 13:59:27 -05:00
Thomas Reynolds
29693e4533 More URI encoding and decoding. Addresses #1406 2014-11-19 10:39:48 -08:00
Thomas Reynolds
d8e8b06cb6 merge v3 2014-11-19 09:04:56 -08:00
Dennis Reimann
e28ed20c63 Asset hashing for image references in srcset 
Fixes #1287
 2014-11-16 21:25:28 +01:00
Max Meyer
f4ce1ff99d Switch to current working directory during testing 2014-11-03 09:17:43 +01:00
Thomas Reynolds
7c37d4ba51 Merge pull request #1338 from dg-ratiodata/feature/chained_templates_partials 
Chained template parsing failed if parent is "html.erb" and child is "html.md.erb"
 2014-10-23 15:25:10 -07:00
Thomas Reynolds
a95dbb6367 Collections 2014-10-15 14:34:53 -05:00
minusfive
17cddce675 Parse asset-hashes on JSON files 2014-09-28 16:39:46 -04:00
Andrew Kvalheim
00b4ac6867 Add a basic feature test for the console. 2014-09-10 16:12:04 -07:00
Dennis Günnewig
55e3c93278 Feature tests for force-option 2014-09-09 09:19:31 +02:00
Thomas Reynolds
84acb50b02 Optimize globbed file lookups, fixes nasty performance regression 2014-08-24 17:10:25 -07:00
Thomas Reynolds
07ac578a31 merge 2014-08-24 11:36:42 -07:00
Thomas Reynolds
a1979f11b1 Update sass dep and test new error message 2014-08-20 09:48:03 -07:00
Thomas Reynolds
51d57afc73 require new compass, fix tests 2014-08-17 13:20:29 -07:00
Christian Höltje
6895f30ff3 Accept pandoc-style YAML frontmatter 
Pandoc (and some other tools) have decided to end their YAML frontmatter
with `...` instead of `---`.  In the name of flexibility, this patch
allows either to mark the end of YAML frontmatter.

Example:

```
---
title: No place like home
...
```
 2014-08-15 13:21:30 -04:00
Thomas Reynolds
0f785a448a updated from stable 2014-08-14 10:14:26 -07:00
Thomas Reynolds
625391953a Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327 2014-08-04 15:07:55 -07:00
Thomas Reynolds
05aa396399 more slim tests. Targets #1327 2014-08-04 14:41:22 -07:00
Thomas Reynolds
724eab3ac9 fix alt tags and add test. Closes #1341 2014-08-03 08:29:29 -07:00
Dennis Günnewig
98a36d68f0 Merge branch 'v3-stable' into feature/chained_templates_partials 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
 2014-07-31 13:00:19 +02:00
Dennis Günnewig
856f05709c Support template chaining for partials 2014-07-31 11:39:02 +02:00
Thomas Reynolds
2f545cefbe Attempt to allow i18n to override partial lookup. #1333 2014-07-24 11:11:27 -07:00
Thomas Reynolds
bedf235ff6 Multiple Source watchers 2014-07-20 18:57:22 -07:00
Thomas Reynolds
525e700bfa Move all templates over to Github. Remove need for auto-loaded extensions in CLI 2014-07-20 14:25:47 -07:00
Thomas Reynolds
9087da05d5 Merge branch 'v3-stable' 2014-07-20 13:54:45 -07:00
Thomas Reynolds
15d6210df8 Use the resource instead of the request path for auto asset helpers. Fixes #1326 2014-07-20 13:53:05 -07:00
Ben Hollis
22dace72df Upgrade url_for to search for resources relative to their destination paths as well as their source paths. This would fix #818. 2014-07-19 16:40:53 -07:00
Thomas Reynolds
6678ea1ae3 merge static partial change 2014-07-18 12:54:27 -07:00
Thomas Reynolds
f0603ddf2f work with static partials. Closes #1206 2014-07-18 10:54:48 -07:00
Eliott Appleford
bf03c14518 merge spec fixes onto master 2014-07-09 14:10:49 +01:00
Ben Hollis
004ba36741 Remove partials_dir functionality 2014-07-07 23:48:49 -07:00
Eliott Appleford
a47b58c58d fix gemfile conflict 2014-07-06 05:48:21 +01:00
Eliott Appleford
21c2b737f5 fix gzip spec 2014-07-06 04:02:43 +01:00
Eliott Appleford
e2e3c1e3fb fix specs on windows 2014-07-03 21:09:32 +01:00
Ben Hollis
d7fd48ef7d Merge branch 'v3-stable' 
Conflicts:
	middleman-core/lib/middleman-more/extensions/asset_hash.rb
 2014-06-28 18:48:49 -07:00
Andrew Kvalheim
429e7d64bd Accept list of paths to exclude from gzipping. 2014-06-24 14:49:51 -07:00
Andrew Kvalheim
b819d38358 Test gzip extensions option. 2014-06-24 14:49:10 -07:00
Thomas Reynolds
434d55b1ae See if code climate hooks work 2014-06-20 14:09:51 -07:00
Ben Hollis
f07bed4ecf Fix custom layouts tests 2014-06-14 12:38:44 -07:00
Thomas Reynolds
a21dca025e Separate Environments from Modes 2014-06-11 10:28:30 -07:00