Thomas Reynolds
409a892da7
Forward port some stable changes
2015-09-17 09:41:17 -07:00
Thomas Reynolds
a251c82562
Add test for #1568
2015-09-17 09:25:04 -07:00
Thomas Reynolds
441dc2faa6
Revert breaking resource source_file api. For #1595
2015-09-09 11:55:56 -07:00
Thomas Reynolds
1efe6a27c5
Add tests for Slim inline filters. Refactor similar feature in Haml filters. Closes #1542
2015-06-16 16:47:42 -07:00
Thomas Reynolds
7383f67874
Implement yaml data postscript
2015-06-16 15:30:37 -07:00
yterajima
c444b3f232
fixed 'after_render' hook is not work.
...
- 'before_render' hook is called twice.
- add simple cucumber test about some hooks.
2015-05-06 16:28:01 +09:00
Thomas Reynolds
33cb9b3ba9
Expand collection laziness to data
2015-04-26 13:22:58 -07:00
Thomas Reynolds
b127283040
Fix up inline url confusion
2015-04-26 13:01:19 -07:00
Thomas Reynolds
2403fa2d81
Merge stable
2015-04-26 11:32:47 -07:00
Thomas Reynolds
a43fa14f34
More tests WRT #1503
2015-04-26 09:43:20 -07:00
Thomas Reynolds
4bdf5a9005
Refactor srcset a little
2015-04-26 09:41:50 -07:00
Thomas Reynolds
45ba4bb0d4
Add slim test to asset_hash. WRT #1503
2015-04-26 09:31:39 -07:00
Thomas Reynolds
22ce56492f
Experiment with Hamster
2015-04-24 10:28:03 -07:00
David Morrow
580431ca43
Resolves issue #1396 supporting srcset
...
allows you to use image_tag helper and have it build the asset urls for
your srcset images, just like it does for your main src. Leaves absolute
urls alone, (having // in the path)
```
<%= image_tage 'pic_1980.jpg', srcset: 'pic_640.jpg 2x, pic_1024.jpg 3x' %>
=> <img src="/images/pic_1980.jpg" srcset="/images/pic_640.jpg 2x, /images/pic_1024.jpg 3x">
```
2015-04-23 17:28:49 -07:00
Thomas Reynolds
4740159a3a
Use Addressable to improve inline url detection and rewriting. Only rewrite relative paths. Closes #1499
2015-04-22 09:41:24 -07:00
Steven Sloan
3b1a00cf47
allow setting a destination_dir for SourceWatchers
...
This change lets a source be defined with a destination directory. That way we can mount a source (say a gem’s ‘doc’ directory) in a namespace and worry less about name collisions with files in other sources.
2015-04-17 16:46:39 -04:00
Thomas Reynolds
a71589becd
Make preview host and port configurable in config.rb and also expose those variables to extensions which are curious. Closes #1477
2015-03-01 18:17:22 -08:00
Thomas Reynolds
c94e5d0f4d
Merge from stable
2015-02-24 11:16:16 -08:00
Thomas Ritz
262e976790
Fixes computation of parent.
...
If there is a file without a basename in root, e.g. `.htaccess`,
`#parent` of another file in root finds `.htaccess` instead of
`index.html`.
Adding the `.htaccess` to the traversal-app fixture exposes this error.
The fix is to no longer scan for possible files if we know the parent
must be root.
2015-02-21 19:07:17 +01: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
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
Thomas Reynolds
f73e89370d
execute modes as configure blocks
2014-09-11 09:40:10 -07: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
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
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
feef2bf71c
Add external command support
2014-07-22 18:38:57 -07:00
Thomas Reynolds
bedf235ff6
Multiple Source watchers
2014-07-20 18:57:22 -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
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
Thomas Reynolds
3ae16111ef
Separate Build from Thor
2014-07-11 09:22:53 -07:00
Thomas Reynolds
52dcf37f24
Merge pull request #1318 from bhollis/partials_dir
...
Remove partials_dir functionality
2014-07-08 09:19:36 -07:00
Ben Hollis
004ba36741
Remove partials_dir functionality
2014-07-07 23:48:49 -07:00
Ben Hollis
a1fe810a50
Fixup after rebase
2014-07-07 22:12:44 -07:00
Ben Hollis
0cbc232dac
Remove neighbor frontmatter support
2014-07-06 16:15:43 -07:00
Eliott Appleford
e2e3c1e3fb
fix specs on windows
2014-07-03 21:09:32 +01:00
Ben Hollis
dfecfebc69
Remove options to proxy or ignore through page, and use Middleman::Util#path_match for matchers to allow a wider set of matchers.
2014-06-28 21:01:26 -07:00
Thomas Reynolds
a21dca025e
Separate Environments from Modes
2014-06-11 10:28:30 -07:00
