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

121 commits

Author SHA1 Message Date
Thomas Reynolds
9d54010656 Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable 2013-02-09 15:49:03 -08:00
Thomas Reynolds
76d09a4964 Pathname issues when combining relative assets and cache buster 2013-02-09 15:37:08 -08:00
Ben Hollis
923697b517 Micro-optimizations around string comparisons 2013-02-09 15:21:52 -08:00
Ben Hollis
ed119bed7b Support .yaml files for i18n 2013-02-09 15:15:52 -08:00
Ben Hollis
fbc4d7e9c7 Handle non-english default languages. Fixes #584 2013-02-09 12:49:11 -08:00
Ben Hollis
afc62d5a26 i18n tweaks 2013-02-09 12:49:11 -08:00
Thomas Reynolds
18da6362ba Allow multi-level i18n files. Fixes #725 2013-01-11 17:23:24 -08:00
Nico Hagenburger
0bedb36f3f added font file types to asset_hash extension 
added svg files to asset_hash extension
 2013-01-09 13:25:04 -08:00
Ben Hollis
1019c7803c Fix error with link_to when options are nil 2013-01-08 22:53:30 -08:00
Thomas Reynolds
49ad35b2c8 correctly handle passing resources into relative link_to 2013-01-07 23:30:04 -08:00
Nico Hagenburger
5b8fae612e backport sass paths fix 2013-01-04 17:20:32 -08:00
Krystian
4ecadd8734 Corrected image_tag helper so that supported_extensions doesn't appear in the tag attributes 
The modifications to add FastImage support made it that supported_extensions="[.png .jpg .jpeg .bmp .gif]" appeared in the img tag attributes upon building the project.
 2013-01-03 22:05:35 -08:00
Thomas Reynolds
aefe61b18f Catch bad URI errors 2013-01-01 17:40:54 -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
a6c74b5231 Fix mail_to 2012-12-31 10:34:10 -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
Daniel Jabbour
4b7411b08a Fixing image_tag helper so it only attempts to auto image sizes file extensions supported by FastImage. This can be overriden by passing param :supported_extensions into the image_tag helper. 2012-12-15 14:51:45 -08:00
Rolf Timmermans
6201e671ef Fix asset hash generation in combination with sprockets. 2012-10-16 19:42:38 +02:00
Ben Hollis
52819cd239 Make sure to require rack/test from asset_hash 2012-09-30 19:25:15 -07:00
Thomas Reynolds
3a4c063535 Reload i18n files when they change, closes #616 2012-09-30 13:17:01 -07:00
Thomas Reynolds
c53c46729a actually make ruby encoding setting work, fix gzip to read/write binary 2012-09-29 14:12:26 -07:00
Thomas Reynolds
061323a09f prep release 2012-09-23 18:43:42 -07:00
Thomas Reynolds
2aec04db69 Merge pull request #558 from bhollis/asset-hash-rack 
Asset_hash doesn't play nice with Sprockets
 2012-09-23 18:41:11 -07:00
Ben Hollis
6c241603ac Delay recalculating sitemap until absolutely necessary, avoiding redundant recalculations. 2012-09-16 19:36:47 -07:00
Ben Hollis
d181ec5f4f Remove use of full_path and odd options from auto_tag 2012-09-16 01:57:37 -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
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
8e7041994f Wire-up and document smacss template 2012-08-14 13:52:07 -07:00
Thomas Reynolds
b3fd8629d3 Merge pull request #562 from nsteiner/smacss 
adding smacss submodule
 2012-08-14 13:43:57 -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
Nate Steiner
7fb6766d4d adding smacss as files instead of a submodule 2012-08-10 14:19:20 -04:00
Nate Steiner
893b7baafd removing smacss submodule 2012-08-10 14:17:10 -04:00
Nate Steiner
e29dfa4ab7 adding smacss submodule 2012-08-10 11:29:19 -04:00
Thomas Reynolds
f1eae1e0c8 Correct path in sass-assets-path test 2012-07-25 12:05:43 -07:00
Thomas Reynolds
de6d7980ac Use centralized Logger and add instrument methods 2012-07-18 09:30:39 -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
Thomas Reynolds
6f0f9b00a2 Merge pull request #536 from kematzy/fix-sass-cache-location 
Fix sass cache location
 2012-07-16 22:14:05 -07:00
kematzy
1de1d3d25e Added :sass_cache_path custom config of SASS cache directory 
The default output of SASS .sass_cache directory is in the Middleman app root directory, which to my mind adds clutter to the directory.

Secondly, when storing Middleman apps in a Dropbox subfolder, the .sass_cache directory gets synced unnecessarily.

This fix enables moving the .sass_cache directory to any path on the system, such as the "/tmp" directory for automatic discarding of files when restarting the system.

Suggested usage:

    #in config.rb
    set :sass_cache_path, File.join('/tmp', "middleman-#{File.basename(Dir.pwd)}", "sass_cache")

which could return something like:

    `/tmp/middleman-example.com/sass_cache`

This keeps multiple projects separated and easily identifiable.
 2012-07-16 14:34:36 +08:00
Tim Bates
2117cbac79 Make directory_indexes check the destination_path 
If the destination_path matches the index_file but the original path
does not (as can happen with proxied resources) then directory_indexes
will add the index file a second time, e.g. resource.path = "myres.html"
and resource.destination_path = "myres/index.html" then
directory_indexes will convert this to resource.destination_path =
"myres/index/index.html". This patch fixes that by making
directory_indexes check the destination_path when determining whether to
reroute.
 2012-07-12 15:02:48 +09:30
Ben Hollis
4c5b614fe2 Make :automatic_image_sizes work for absolute image paths 2012-07-09 00:22:07 -07:00
Ben Hollis
6dad42bc77 Fix gzip extension 2012-07-07 20:50:43 -07:00
Thomas Reynolds
4b03c5e2df Add Middleman::Util.all_files_under to get a recursive listing of files beneath a path, follows symlinks. Fixes #515 2012-07-06 19:32:05 -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
57f5701e72 Add a Middleman::Util.path_match function that handles matching on regexes, globs, and procs, and use it from asset_hash, minify_javascript, and minify_css. Fixes #480. 2012-06-16 20:26:42 -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
Daniel Bayerlein
8fefbe350b Remove double whitespace. 2012-06-10 00:13:04 +03:00
Daniel Bayerlein
cc1a741eb7 Move "set :fonts_dir" from "middleman-more" to "middleman-core". 2012-06-09 20:30:22 +02:00
Ben Hollis
0d0d572c3a Rename internationalization module to avoid conflict with regular I18n module. Fixes #458. 2012-06-05 22:00:16 -07:00