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

2958 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds 56c7ef7905 Merge pull request #1504 from cllns/fix-whitespace 
Remove spaces on empty lines in default layout.erb
 2015-04-26 09:44:31 -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
Sean Collins c1ce3ffd61 Remove spaces on empty lines 2015-04-26 12:16:55 -04:00
Thomas Reynolds 5f9820dc63 Update changelog. 2015-04-24 10:37:03 -07:00
Thomas Reynolds c30976ccf5 Fix Rack support. Closes #1501 2015-04-24 10:32:05 -07:00
Thomas Reynolds 4be3fcfd31 Fix recursive enhance on nil values 2015-04-24 10:28:03 -07:00
Thomas Reynolds c25229065a Better indiff logic 2015-04-24 10:28:03 -07:00
Thomas Reynolds 22ce56492f Experiment with Hamster 2015-04-24 10:28:03 -07:00
Thomas Reynolds 55c5a46440 Update contracts gem. #1494 2015-04-24 10:26:42 -07:00
Thomas Reynolds 07eca1e560 Merge pull request #1500 from dperrymorrow/srcset-support 
Pull request for issue #1396 supporting srcset property in image tags
 2015-04-24 09:20:43 -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
Thomas Reynolds 40e01b0b21 Merge pull request #1498 from stevenosloan/allow_setting_destination_directory_for_source_watchers 
allow setting a destination_dir for SourceWatcher(s)
 2015-04-17 15:03:29 -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 60b3bfcee2 Attempt to address #1497 2015-04-16 12:11:52 -07:00
Thomas Reynolds f61e08a9c3 Allow more permissive compass versions 2015-03-30 17:05:36 -07:00
Thomas Reynolds 30721436c0 Allow extensions to activate extensions 2015-03-27 10:56:09 -07:00
Thomas Reynolds af486d7d2a prep 2015-03-24 09:14:33 -07:00
Thomas Reynolds d845503f50 Add jruby to the list of envs requiring tzinfo-data. Addresses comments in #1458 2015-03-21 11:21:03 -07:00
Simon-Pierre LeBel 4e88a66083 Added support for complete path localization 2015-03-19 16:20:19 -04:00
Thomas Reynolds 6fef5b3a93 Require forwardable. Closes #1479 2015-03-05 09:46:38 -08:00
Thomas Reynolds 7f2048b865 Don't lookup resource for path if the path is absolute. Fixes #1195 2015-03-03 13:09:46 -08: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 26c6f453f3 Add file watcher :only option 2015-02-26 17:08:40 -08:00
Thomas Reynolds d60cd3a044 Merge pull request #1473 from AndrewKvalheim/overridable-console 
Move IRB initialization into a dedicated method.
 2015-02-25 23:08:03 -08:00
Andrew Kvalheim 8817f4ab38 Move IRB initialization into an overridable method. 2015-02-25 17:11:29 -08:00
Andrew Kvalheim 049dabbf15 Use configurable content type for detection of minifiable content. 
Squashed changes:

  - Prevent side effects of content type testing.
  - Test for inline minification in PHP files.
 2015-02-25 16:08:26 -08:00
Thomas Reynolds ef835862bc Merge pull request #1472 from schurig/assets_pipeline_hash_for_woff2 
Append assets hash also to .woff2 files
 2015-02-25 14:20:43 -08:00
Martin Schurig 10ed3c2447
append assets hash also to .woff2 files 2015-02-25 20:43:46 +01:00
Thomas Reynolds c94e5d0f4d Merge from stable 2015-02-24 11:16:16 -08:00
Thomas Reynolds ce2d5028b2 Merge pull request #1445 from alex88/patch-1 
Add Woff2 to asset hash extensions
 2015-02-24 09:50:51 -07:00
Thomas Reynolds fbe71f51e4 Merge pull request #1465 from thomasritz/fix-wrong-parent 
Fixes computation of `parent`.
 2015-02-23 14:18:31 -07: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
Thomas Reynolds 973f79a103 Dropping ruby 1.9.x support 2015-02-23 12:29:51 -08:00
Thomas Reynolds a3519bdf37 Bump 2015-02-23 12:28:30 -08:00
Thomas Reynolds cac0484de8 Fixes #1469 2015-02-23 12:26:37 -08:00
Eliott Appleford e2ae2e5e42 Merge pull request #1468 from vassilevsky/fix-grammar 
Fix grammar in a scenario
 2015-02-23 16:52:01 +00:00
Eliott Appleford 35e01136fc Merge pull request #1467 from henrik/patch-1 
Fix proxy pages link in config template
 2015-02-23 16:50:40 +00:00
Ilya Vassilevsky 4d75ba7749 Fix grammar in a scenario 2015-02-23 01:53:14 +03:00
Henrik Nyh 55673480dc Fix proxy pages link in config template 
Old link is broken.
 2015-02-22 20:31:28 +01: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
Thomas Reynolds ad05b33cf6 Merge pull request #1459 from twuni/bugfix/readme-pessimistic-versioning-link 
Fixing broken (outdated) link for the Pessimistic Versioning Constraint.
 2015-02-19 15:00:21 -08:00
Devin Canterberry ac1e289064 Fixing broken (outdated) link for the Pessimistic Versioning Constraint. 2015-02-19 14:56:19 -08:00
Eliott Appleford a977f8bf20 Merge pull request #1416 from dg-ratiodata/feature/fix_offenses 
Fix rubocop offenses
 2015-02-19 00:50:46 +00:00
Thomas Reynolds 6a228bc5c9 Merge pull request #1457 from Arcovion/slim-update 
Fix slim >= 3.0.0 deprecation warning
 2015-02-18 16:33:56 -08: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
Eliott Appleford 0230e26a8c Fix slim >= 3.0.0 deprecation warning 2015-02-18 14:22:50 +00:00
Thomas Reynolds 1cce64d463 Bump 2015-02-17 16:08:58 -08:00