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

3066 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds 6de88a832e Make Ruby Sass the default, but use SassC if available. Addresses #1648 2015-11-27 15:41:42 -08:00
Thomas Reynolds b4697e4541 Merge pull request #1696 from zacps/patch-1 
Added rubyinstaller-devkit dependency for windows.
 2015-11-27 15:27:04 -08:00
Thomas Reynolds dd0ee24ca3 Work around Listen :only weirdness. Addresses #1637 2015-11-27 15:26:46 -08:00
Zac Pullar-Strecker e23bd151bf Added rubyinstaller-devkit dependency for windows. 2015-11-28 12:16:13 +13:00
Thomas Reynolds 822a9f0ecc Fix layout detection on non-html files 2015-11-27 14:26:34 -08:00
Thomas Reynolds 4594f46fb8 Minor tweak to #1695 2015-11-27 14:16:55 -08:00
Thomas Reynolds b0582bcebf Merge pull request #1695 from johnnyshields/fix-sass-livereload-master 
Fix SASS partial live reloading
 2015-11-27 13:55:15 -08:00
Johnny Shields 13a14d43d4 In SourceWatcher, add a subroutine to find files which should be considered "also dirty" when a given file is touched. 2015-11-27 15:20:20 +09:00
Thomas Reynolds 45939e7e93 Merge pull request #1687 from stevenosloan/allow_asset_url_to_work_without_a_resource 
Allow asset url to work without passing a current_resource (v4)
 2015-11-13 17:33:57 -08:00
Steven Sloan 6ab6669456 fix(Util::asset_url): allow use without passing a current_resource 
Most cases the current_resource isn’t actually needed, so calls could be made
from extensions and still get the correct path back.

An exception will be raised with a descriptive message if the current_resource
is needed but not given. (for example, if relative is true — it needs a resource
to base the url on)
 2015-11-13 16:48:52 -05:00
Steven Sloan 49a7435dc9 spec(Util::asset_url): add specs covering each conditional branch 2015-11-13 16:37:58 -05:00
Steven Sloan f16fc2229e feat(testing): add a fixture/file helper for rspec tests 2015-11-13 16:34:08 -05:00
Thomas Reynolds 37d96a9b14 Adapt to style changes and removal of on 2015-11-11 15:30:40 -08:00
Thomas Reynolds 169b6f2c0a Merge pull request #1683 from maxmeyer/feature/preview_server_daemon 
Make middleman's preview server a daemon
 2015-11-11 15:11:37 -08:00
Thomas Reynolds fbf77d2ad2 Merge pull request #1684 from maxmeyer/patch-2 
Add warning for master as well
 2015-11-11 15:11:29 -08:00
Dennis Günnewig 022779ef27 Add warning for master as well 2015-11-11 23:30:49 +01:00
Dennis Günnewig ce998cf685 Add changelog entry 2015-11-11 23:28:38 +01:00
Dennis Günnewig 8c7e156bd4 Make middleman's preview server a daemon 2015-11-11 23:28:38 +01:00
Thomas Reynolds 916a5a508b fix some tests 2015-11-11 13:46:09 -08:00
Thomas Reynolds b4457c98d2 Merge pull request #1647 from middleman/frontmatter_delims 
Frontmatter delims
 2015-11-11 13:20:15 -08:00
Thomas Reynolds 684a80c906 Change no-layout to the default, except for .html 2015-11-11 12:58:07 -08:00
Thomas Reynolds 90490d696f Merge pull request #1678 from maxmeyer/feature/server_hook 
Add "before_server"-hook to preview server in v4
 2015-11-11 12:26:22 -08:00
Dennis Günnewig 0f8ea86119 Add hook for before_server 2015-11-08 11:03:25 +01:00
Dennis Günnewig a61b2e3b87 Move HTTPS to server_information 2015-11-07 18:50:55 +01:00
Thomas Reynolds ec99a7b28f Merge pull request #1657 from mojavelinux/issue-1656 
resolves #1656 don't mangle URL inside tag
 2015-10-26 14:52:30 -07:00
Dan Allen c48c81cbba resolves #1656 don't mangle URL inside tag 2015-10-26 15:30:44 -06:00
Thomas Reynolds 30e37293b3 Merge pull request #1655 from mojavelinux/issue-1653 
resolves #1653 don't rewrite paths that start with //
 2015-10-26 10:21:11 -07:00
Thomas Reynolds 765c28114a Merge pull request #1654 from mojavelinux/patch-1 
Ignore .ruby-gemset file
 2015-10-26 10:20:13 -07:00
Dan Allen 4995bd23d7 resolves #1653 don't rewrite paths that start with // 2015-10-26 00:39:48 -06:00
Dan Allen c07af953f8 Ignore .ruby-gemset file 
Ignore the .ruby-gemset file used to define an RVM gemset.
 2015-10-25 23:58:39 -06:00
Eliott Appleford 19d21d2295 make frontmatter delims configurable 2015-10-23 09:40:24 +00:00
Thomas Reynolds 3cd84eb4d1 move_file as a replacement for import_asset 2015-10-22 20:23:39 -07:00
Thomas Reynolds 62d7fa0676 remove unused file 2015-10-12 12:37:42 -07:00
Thomas Reynolds d2251de898 Bump Padrino 2015-10-12 12:37:33 -07:00
Thomas Reynolds 6357f4f5b8 Add back app.set, but mark as deprecated 2015-10-12 12:37:07 -07:00
Thomas Reynolds eb82f402a0 gem bumps 2015-10-05 09:48:17 -07:00
Thomas Reynolds f4bff73b7b Merge pull request #1622 from y-yagi/master_remove_unnecessary_require 
remove unnecessary require
 2015-10-04 17:57:55 -07:00
yuuji.yaginuma e26f83e1c2 remove unnecessary require 
`require 'rubygems'` is already required in Ruby 1.9 or later.
 2015-10-04 07:24:21 +09:00
Thomas Reynolds e9abfe1134 rubocop 2015-10-01 13:54:54 -07:00
inoue_sachiro 67fc3d0c05 Fix: Can't clean files when the project is under a hidden directory. 2015-10-01 13:54:45 -07:00
Thomas Reynolds fd6a2376bd Fix frontmatter on 2.0 2015-10-01 10:25:53 -07:00
Thomas Reynolds d828067189 Fix sass helpers in SassC context 2015-09-30 11:16:57 -07:00
Thomas Reynolds 0698d7f5aa Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression" 
This reverts commit 5e3ddbf988.
 2015-09-30 10:24:12 -07:00
Eliott Appleford 9686c1ec7a Merge pull request #1611 from middleman/Arcovion-patch-2 
Fix frontmatter regex
 2015-09-30 08:17:18 +01:00
Eliott Appleford b389c26b4e Fix frontmatter regex 2015-09-30 04:58:59 +00:00
Eliott Appleford 9df1a45301 Strip newline after frontmatter 
Closes #1610
 2015-09-30 05:00:57 +01:00
Thomas Reynolds 5e3ddbf988 Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression 2015-09-29 10:27:53 -07:00
Thomas Reynolds d9fc7a95e1 Fix a bad i18n regression 2015-09-28 14:52:16 -07:00
Thomas Reynolds 04c133c90f Fix minify css tests 2015-09-28 13:58:49 -07:00
Thomas Reynolds 32891dc6fe SassC, woot 2015-09-28 11:24:37 -07:00