Commit graph

3024 commits

Author SHA1 Message Date
Thomas Reynolds
144660660f Merge pull request #1381 from minusfive/asset-hash-json
Parse asset-hashes on JSON files
2014-09-28 15:06:39 -07:00
minusfive
17cddce675 Parse asset-hashes on JSON files 2014-09-28 16:39:46 -04:00
Thomas Reynolds
1b0b666130 bump 2014-09-15 15:36:57 -07:00
Thomas Reynolds
e326e10e98 listen gem started using full paths instead of relative. Fixes #1374 2014-09-15 15:36:41 -07:00
Thomas Reynolds
f73e89370d execute modes as configure blocks 2014-09-11 09:40:10 -07:00
Thomas Reynolds
e4090760e8 Merge pull request #1371 from AndrewKvalheim/console
Add a basic feature test for the console.
2014-09-10 18:27:27 -07:00
Andrew Kvalheim
ba6ca5b3b7 Fix bug with starting the console. 2014-09-10 16:12:04 -07:00
Andrew Kvalheim
00b4ac6867 Add a basic feature test for the console. 2014-09-10 16:12:04 -07:00
Thomas Reynolds
2ff64fe3a3 Merge pull request #1369 from dg-ratiodata/feature/force_init
Add force option to "middleman init"
2014-09-09 08:43:27 -07:00
Dennis Günnewig
d45911f7b8 Add force-option to init 2014-09-09 09:19:41 +02:00
Dennis Günnewig
55e3c93278 Feature tests for force-option 2014-09-09 09:19:31 +02:00
Dennis Günnewig
fbe1585ce6 Rubocop fails faster than 'rake test' 2014-09-09 09:19:31 +02:00
Dennis Günnewig
b78515ce91 Fixed rubocop offense 2014-09-09 09:02:50 +02:00
Thomas Reynolds
313a2398d4 attempt to get compass 1 working 2014-09-02 12:43:20 -07:00
Thomas Reynolds
5a85d177c2 Catch File read exceptions in frontmatter 2014-08-29 10:24:45 -07:00
Thomas Reynolds
e28850c9d7 slim down travis 2014-08-24 19:06:31 -07:00
Thomas Reynolds
df22160173 apparently nums are freezable 2014-08-24 18:30:14 -07:00
Thomas Reynolds
5c18b85a8e more freeze fixin 2014-08-24 18:11:56 -07:00
Thomas Reynolds
1d5ae59db9 Lazy isn't in 1.9.3 :( 2014-08-24 17:35:02 -07:00
Thomas Reynolds
84acb50b02 Optimize globbed file lookups, fixes nasty performance regression 2014-08-24 17:10:25 -07:00
Thomas Reynolds
6ef96cc15a more instrumenting 2014-08-24 15:49:53 -07:00
Thomas Reynolds
c3492b1f7b Fix partial lookup 2014-08-24 14:38:06 -07:00
Thomas Reynolds
07ac578a31 merge 2014-08-24 11:36:42 -07:00
Thomas Reynolds
18825e7ced no reason for image sizes to touch the alt attr 2014-08-22 09:36:07 -07:00
Thomas Reynolds
0d2bcbabe9 Remove duplicate attr_accessor. Closes #1352 2014-08-20 09:48:55 -07:00
Thomas Reynolds
a1979f11b1 Update sass dep and test new error message 2014-08-20 09:48:03 -07:00
Thomas Reynolds
9b88906784 bump ver 2014-08-18 15:32:56 -07:00
Thomas Reynolds
ad93f3d8ae fix some uncaught regressions 2014-08-18 14:53:15 -07:00
Thomas Reynolds
d4010c9dc4 prep for realz 2014-08-18 14:00:28 -07:00
Thomas Reynolds
51d57afc73 require new compass, fix tests 2014-08-17 13:20:29 -07:00
Thomas Reynolds
345cbdcce2 Merge pull request #1350 from docwhat/pandoc-frontmatter
Accept pandoc-style YAML frontmatter
2014-08-15 13:46:52 -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
e9661a88c5 prep alpha 2014-08-15 10:09:08 -07:00
Thomas Reynolds
96c4416246 ver bump 2014-08-15 09:41:19 -07:00
Thomas Reynolds
e886eeaa3e add middleman.rb option 2014-08-14 20:34:31 -07:00
Thomas Reynolds
0f785a448a updated from stable 2014-08-14 10:14:26 -07:00
Thomas Reynolds
fae0e00f42 Add webp to our image type lists 2014-08-14 09:04:26 -07:00
Thomas Reynolds
2b928a326c Handle breaking padrino change. Closes #1349 2014-08-13 20:24:20 -07:00
Thomas Reynolds
207da11372 lock asciidoctor dep 2014-08-13 11:57:29 -07:00
Thomas Reynolds
3fb9c75585 Merge pull request #1347 from bitaculous/bump_compass_import_once
Bump “compass-import-once” dependency to version `1.0.5`.
2014-08-13 14:43:09 -04:00
Maik Kempe
309ebe6121 [➠] Bumped “compass-import-once” dependency to version 1.0.5. 2014-08-13 11:30:45 +02:00
Thomas Reynolds
a880fa464c CHANGELOG updates 2014-08-04 15:11:30 -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
1c977a83e2 prep 2014-08-03 08:37:46 -07:00
Thomas Reynolds
724eab3ac9 fix alt tags and add test. Closes #1341 2014-08-03 08:29:29 -07:00
Dennis Günnewig
fee6a8b617 Make rubocop happy 2014-07-31 13:13:07 +02: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
Dennis Günnewig
0add2e6676 Added a step to create templates on the fly 2014-07-31 08:46:22 +02:00