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

2466 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds ddfa37faee Use HTTPS by default in new project Gemfiles. Closes #1372 2014-10-12 09:38:14 -05:00
Thomas Reynolds 49a7c1f3da Merge pull request #1389 from tricknotes/ruby-2.2 
Test against Ruby 2.2.0 on Travis CI
 2014-10-09 09:26:31 -07:00
Ryunosuke SATO 1142630dc8 Test against Ruby 2.2.0 on Travis CI 2014-10-09 00:30:35 +09:00
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 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 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 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 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
Thomas Reynolds b39b913cfb Merge pull request #1337 from dg-vrnetze/feature/new_server_steps 
Added some new steps to test middleman applications
 2014-07-29 07:22:38 -07:00
Max Meyer 398a038523 Support check for status code 2014-07-29 09:04:10 +02:00
Max Meyer 6dc7eb6353 Support should not see block 2014-07-29 09:03:56 +02:00
Thomas Reynolds 2f545cefbe Attempt to allow i18n to override partial lookup. #1333 2014-07-24 11:11:27 -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 2426abe6f5 bump deps 2014-07-18 14:16:50 -07:00
Thomas Reynolds f0603ddf2f work with static partials. Closes #1206 2014-07-18 10:54:48 -07:00
Thomas Reynolds b6951f2729 use stable sprockets branch 2014-07-17 09:32:38 -07:00
Eliott Appleford 249c649760 Merge pull request #1312 from Arcovion/windows-specs 
Fix specs on windows
 2014-07-06 07:44:20 +01: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
Thomas Reynolds 8bf523853e Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable 2014-07-05 18:42:21 -07:00
Thomas Reynolds ffa8415aaf bump aruba dep 2014-07-05 18:42:15 -07:00
Thomas Reynolds 605bd4ca24 Update README.md 2014-07-05 18:35:39 -07:00
Thomas Reynolds 5f515de2b6 Merge pull request #1315 from Arcovion/v3-stable 
Update badges
 2014-07-05 18:28:23 -07:00
Eliott Appleford c824807119 Update badges 2014-07-06 02:13:42 +01:00