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

152 commits

Author SHA1 Message Date
Ben Hollis
51a494b343 Merge remote-tracking branch 'origin/3.0-stable' 2013-02-10 18:05:24 -08:00
Ben Hollis
d553c6a88e Protect against unset current_path 2013-02-10 17:51:47 -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
e4b5202238 Provide some helpful error messages when link_to is used improperly 2013-02-10 15:28:03 -08:00
Ben Hollis
3a3d5bbe3b Override form_tag to use url_for. Fixes #739 2013-02-10 15:20:51 -08:00
Ben Hollis
6fa6c021c0 Refactor out a url_for method 2013-02-10 15:20:51 -08:00
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
Thomas Reynolds
7f7ce07910 Merge pull request #756 from bhollis/yaml 
l18n: Should load both locales/*.yml and locales/*.yaml files
 2013-02-09 14:40:10 -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
Ben Hollis
7e0ae0e59c Support .yaml files for i18n 2013-02-09 10:15:25 -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
Thomas Reynolds
277f1b5bb4 merge frontmatter fix 2013-01-11 17:27:24 -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
Nico Hagenburger
fbb7820ecd added font file types to asset_hash extension 
added svg files to asset_hash extension
 2013-01-09 13:23:56 -08:00
Ben Hollis
df539e2743 Fix error with link_to when options are nil 2013-01-09 13:23:55 -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
Nico Hagenburger
0ab7cdcbe1 add import paths instead of resetting them 2013-01-04 21:14:19 +01:00
Ben Hollis
15ca8db58d Revert 8606fb4eba and 40a60efd28 since the original problem had already been solved by handling FastImage::UnknownImageType in 0d806277f9. See #660. 2013-01-03 22:55:10 -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
Krystian
40a60efd28 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:46:45 -05: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
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
028c3ec480 Fix mail_to 2012-12-30 15:55:54 -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
Thomas Reynolds
1f3650ccea make rack::lint happy 2012-12-25 22:30:25 -08:00
Thomas Reynolds
55291edc65 Merge pull request #374 from middleman/metapages 
Idea: Metadata pages
 2012-12-25 16:12:27 -08:00
Ben Hollis
ae743ac4db Conform to the rack specs, with help from Rack::Lint 2012-12-25 16:11:13 -08:00
Thomas Reynolds
45ddc0c344 Make Sitemap metadata queryable with arel-style API 2012-12-25 16:05:54 -08:00
Thomas Reynolds
c2d816fb02 Merge pull request #591 from bdielman/smacss 
Reorganized SMACSS template for greater flexibility
 2012-12-25 15:54:15 -08:00
Thomas Reynolds
bd47af5744 alternative asset_host initializer 2012-12-19 09:42:55 -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
Daniel Jabbour
8606fb4eba 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-11-05 18:09:30 -08:00
Ben Hollis
0d806277f9 Don’t print a warning when FastImage doesn’t know about a file type 2012-10-20 21:18:42 -07:00
Rolf Timmermans
da11eae106 Fix asset hash generation in combination with sprockets. 2012-10-16 16:57:00 -07:00
Rolf Timmermans
6201e671ef Fix asset hash generation in combination with sprockets. 2012-10-16 19:42:38 +02:00
Ben Hollis
a50ca56fbc Switch over to new config methods 2012-10-13 21:37:02 -07: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