Ben Hollis
4745418200
Merge remote-tracking branch 'origin/3.0-stable'
...
Conflicts:
.travis.yml
Gemfile
middleman-core/lib/middleman-core/version.rb
middleman-core/middleman-core-x86-mingw32.gemspec
middleman-core/middleman-core.gemspec
2013-03-02 22:32:03 -08:00
Ben Hollis
9057b7a85e
Support Haml 4. Tests only run with Haml 4 now. Fixes #783
2013-02-17 19:40:17 -08:00
Ben Hollis
52c4677391
Merge remote-tracking branch 'origin/3.0-stable'
...
Conflicts:
middleman-core/lib/middleman-core/core_extensions/data.rb
middleman-core/lib/middleman-core/core_extensions/front_matter.rb
middleman-core/lib/middleman-core/util.rb
middleman-core/middleman-core-x86-mingw32.gemspec
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
middleman-more/lib/middleman-more/core_extensions/i18n.rb
2013-02-10 15:41:36 -08:00
Ben Hollis
3a3d5bbe3b
Override form_tag to use url_for. Fixes #739
2013-02-10 15:20:51 -08:00
Ben Hollis
ba035882fe
Test for url_for
2013-02-10 15:20:51 -08:00
Thomas Reynolds
ae7f75e5cc
Relative Assets shouldn't return a Pathname sometimes, the rest of the code expects Strings
2013-02-09 15:53:21 -08:00
Ben Hollis
7020bdce1a
Failing test for #584 "i18n fails when default locale is not english"
2013-02-09 12:49:06 -08:00
Ben Hollis
c0c14f4eab
Merge remote-tracking branch 'origin/3.0-stable'
...
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/cli/build.rb
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/preview_server.rb
middleman-core/lib/middleman-core/renderers/sass.rb
middleman-core/lib/middleman-core/sitemap/store.rb
middleman-core/lib/middleman-core/util.rb
middleman-core/lib/middleman-core/version.rb
middleman-more/lib/middleman-more/core_extensions/compass.rb
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
middleman-more/lib/middleman-more/extensions/asset_hash.rb
2013-01-25 21:43:30 -08:00
Steven Sloan
17ad2caf11
also "build" .htpasswd files
2013-01-21 11:21:48 -08:00
Steven Sloan
c121c407df
also "build" .htpasswd files
2013-01-18 20:13:49 -05:00
Thomas Reynolds
80fb3ff06f
merge
2013-01-13 15:25:35 -08:00
Thomas Reynolds
c7e35b95ba
use .sass-cache everywhere
2013-01-13 15:22:36 -08:00
Thomas Reynolds
49ad35b2c8
correctly handle passing resources into relative link_to
2013-01-07 23:30:04 -08:00
Ben Hollis
ed5893ffcd
Add a :query option to link_to to allow specifying query string
2012-12-31 10:34:13 -08:00
Ben Hollis
3214cac153
Make link_to ignore (and preserve) query string and anchor in URLs/paths.
2012-12-31 10:33:10 -08:00
Ben Hollis
9954bce2e3
Add a :query option to link_to to allow specifying query string
2012-12-30 16:27:33 -08:00
Ben Hollis
377aa41a23
Make link_to ignore (and preserve) query string and anchor in URLs/paths.
2012-12-30 15:55:54 -08:00
Avia Aharon
6e44851069
test asset_hash ignored paths
2012-12-18 12:28:17 +02:00
Thomas Reynolds
0eb906efac
Stylus support and tests. Fixes #649
2012-10-28 12:19:47 -07:00
Thomas Reynolds
01e9c336b0
Stylus support and tests. Fixes #649
2012-10-28 12:18:29 -07:00
Thomas Reynolds
3a4c063535
Reload i18n files when they change, closes #616
2012-09-30 13:17:01 -07:00
Ben Hollis
09ba0049d4
Fix asset_hashing assets affected by Rack middleware or mounted apps (like sprockets). Fixes #558
2012-09-11 00:08:58 -07:00
Adam Luikart
4076666c19
Add test for asset_hashing rack-filtered items.
2012-09-11 00:08:57 -07:00
Thomas Reynolds
05834ad386
Test relative_assets with i18n
2012-09-02 10:04:43 -07:00
Thomas Reynolds
1998668a87
Disable buggy color-compression in built-in Rainpress CSS minification. Fixes #576
2012-08-28 16:08:34 -07:00
Thomas Reynolds
54c055ea5e
Hack a way to pass Middleman context into Slim filters
2012-08-16 13:48:34 -07:00
Thomas Reynolds
446aa6a4ba
Clean up whitespace, play with cane for testing style quality and code complexity
2012-08-13 15:41:07 -07:00
Thomas Reynolds
1c9810483b
Ruby 1.8-friendly markdown image test
2012-07-25 11:39:17 -07:00
Thomas Reynolds
6ccf5e2db0
Don't catch CoffeeScript errors when in build mode. Fixes #551
2012-07-25 11:22:29 -07:00
Ben Hollis
e6c7caaa83
Test for Redcarpet using our link_to and image_tag helpers
2012-07-18 22:57:52 -07:00
kematzy
3ea2241155
Added :sass_assets_path for external SASS repositories
...
Compass is great, but sometimes we need to have common framework code in one (global) location with local overrides in the app.
This addition adds built-in support for loading SASS/SCSS files from multiple locations external to the "source" directory and even the Middleman app root.
Example usage:
# in config.rb
set :sass_assets_path, [ "#{root}/assets/sass/", "~/.sass-repo/"]
Using symlinks or copying files to the Middleman project can get messy quickly. This fix reduces some of those issues.
2012-07-17 09:21:46 -07:00
kematzy
c00f9d5782
Tests for :sass_cache_path custom config
...
First time working with Cucumber, so perhaps not the best way to do things.
* Tests for default setting which stores the .sass_cache directory in Middleman app root.
* Tests for custom setting which stores the .sass_cache directory in /tmp directory.
Please Note! Unable to test the output of the default .sass_cache location since the directory is stored outside of the app root during testing, but inside app root in "production"
2012-07-16 14:39:26 +08:00
Thomas Reynolds
d4259315e7
version bump [ci skip]
2012-07-04 16:47:01 -07:00
Thomas Reynolds
63224639d9
Add tests for more implied extensions
2012-07-04 16:45:27 -07:00
Ben Hollis
4faa98e874
Simplify and fix relative_assets extension to work more consistently. Also, fix a bug in relative link_to inspired by fixing this bug. This fixes #507 .
2012-06-30 22:02:23 -07:00
Ben Hollis
6ac263619a
Make :http_prefix work in link_to and asset helpers as long as the linked item is a sitemap resource. Fixes #484 .
2012-06-23 17:19:24 -07:00
Ben Hollis
8a01b28369
Improve link_to so that it can handle a Resource in place of a url. Fixes #474 .
2012-06-16 17:48:41 -07:00
Thomas Reynolds
aa0d848ba5
Don't test Less on JRuby
2012-06-05 10:28:09 -07:00
Thomas Reynolds
286c7352b6
Fix Less load paths, simplify builder error output. Fixes #461
2012-06-05 10:24:00 -07:00
Thomas Reynolds
02871f5fcc
Avoid JRuby whitespace issue
2012-06-02 15:32:04 -07:00
Thomas Reynolds
e26b68635f
Haml wrap_layout passes again
2012-06-02 14:19:45 -07:00
Ben Hollis
efa846341d
Update nested_layout tests to show that Haml still doesn't work right. Also updated Slim and ERb tests to verify ordering of output.
2012-06-02 00:35:03 -07:00
Ben Hollis
f287e0a2bc
Don't asset_hash ico and manifest. Now with tests to prevent another regression.
2012-06-01 23:54:57 -07:00
Thomas Reynolds
2ab294c602
Fix wrap_layout for all know templating engines. Fixes #417
2012-06-01 20:08:28 -07:00
Ben Hollis
9b5d1f17d0
Test showing wrap_layout is still broken when used with haml
2012-06-01 19:05:55 -07:00
Ben Hollis
d8d4769702
Fix nested layouts for ERB
2012-06-01 19:05:55 -07:00
Thomas Reynolds
c3c662cf44
adapt minify_css test to compass line_comments change
2012-05-26 15:15:53 -07:00
Thomas Reynolds
98fc81beef
Implement and test asset_hash ignore option
2012-05-26 15:08:59 -07:00
Thomas Reynolds
8d483f882c
Move Sprockets into an extension
2012-05-26 13:43:27 -07:00
Thomas Reynolds
f8c64f25ec
Put test ENV in the right place so cucumber/rake both work
2012-05-25 18:19:11 -07:00
