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

2479 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds af132f6207 disable cane 2013-01-14 23:33:16 -08:00
Thomas Reynolds ae9e6e722e bye bye pry 2013-01-14 22:41:11 -08:00
Thomas Reynolds 4e9ec930c4 bye bye pry 2013-01-14 22:40:37 -08: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 7c1d55cb38 merge 2013-01-13 12:00:25 -08:00
Daniel Bayerlein e3bb956649 Update installation command for susy-gem. 2013-01-13 11:59:41 -08:00
Thomas Reynolds 1b1a5c086e Add --force-polling flag to server. Closes #730. Closes #644 2013-01-13 11:57:18 -08:00
Thomas Reynolds d4f5e4db29 Add --force-polling flag to server. Closes #730. Closes #644 2013-01-13 11:56:53 -08:00
Thomas Reynolds 428912850f Merge pull request #729 from danielbayerlein/update-susy-command 
Update installation command for susy-gem.
 2013-01-12 17:38:24 -08:00
Daniel Bayerlein 2dca9e5787 Update installation command for susy-gem. 2013-01-12 16:40:00 +01:00
Thomas Reynolds 277f1b5bb4 merge frontmatter fix 2013-01-11 17:27:24 -08:00
Thomas Reynolds a76b02a55b Don't look for frontmatter on binary files. Fixes #728 2013-01-11 17:25:45 -08:00
Thomas Reynolds 18da6362ba Allow multi-level i18n files. Fixes #725 2013-01-11 17:23:24 -08:00
Thomas Reynolds 2e2516b95a Don't look for frontmatter on binary files. Fixes #728 2013-01-11 16:58:02 -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
Thomas Reynolds 7231f9dfe2 Merge branch 'master' of github.com:middleman/middleman 2013-01-09 13:24:41 -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
Thomas Reynolds aa633a1cd3 make windows rack generic again 2013-01-09 10:28:47 -08:00
Thomas Reynolds e82aa6cc61 make blksize work on windows. 2013-01-09 09:49:23 -08:00
Ben Hollis 1019c7803c Fix error with link_to when options are nil 2013-01-08 22:53:30 -08:00
Thomas Reynolds 8e7a87e167 Merge pull request #714 from bhollis/link_to 
3.0.8/3.0.9 breaks middleman-blog's `tag_path` method
 2013-01-08 22:53:09 -08:00
Ben Hollis 3d00e91605 Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3) 2013-01-08 22:52:40 -08:00
Thomas Reynolds 3521b7527b Merge pull request #717 from bhollis/rack 
Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3)
 2013-01-08 22:51:31 -08:00
Ben Hollis e3b9a41d3b Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3) 2013-01-08 20:35:57 -08:00
Ben Hollis a33ef20726 Fix error with link_to when options are nil 2013-01-08 19:41:07 -08:00
Thomas Reynolds d6c2cf305b prep 3.0.9 2013-01-08 10:33:19 -08:00
Thomas Reynolds eccda125e5 Remove Tilt mappings for missing libraries. Fixes #713 2013-01-08 10:24:07 -08:00
Thomas Reynolds 84239f04a2 lock rack version 2013-01-08 10:23:13 -08:00
Thomas Reynolds 49ad35b2c8 correctly handle passing resources into relative link_to 2013-01-07 23:30:04 -08:00
Thomas Reynolds 0a580c8b9a prep 3.0.8 2013-01-07 22:56:36 -08:00
Nico Hagenburger 5b8fae612e backport sass paths fix 2013-01-04 17:20:32 -08:00
Thomas Reynolds 3ec36ce07b Merge pull request #707 from hagenburger/master 
Add import paths instead of resetting them
 2013-01-04 17:14:08 -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
Thomas Reynolds 55a674853f Merge pull request #705 from Krystosterone/master 
supported_extensions attribute was added to the img tag when using image_tag
 2013-01-03 22:04:53 -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 057c3724fe bump required sprockets 2013-01-03 13:08:19 -08:00
Thomas Reynolds 7cd6cd233e Manually copy the file instead of asking Thor to do it 2013-01-02 16:40:42 -08:00
Thomas Reynolds aefcdabb52 prep pre 2013-01-01 19:10:54 -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
Thomas Reynolds fbb2a355d7 Copy binary files instead of rendering through MM. Closes #643. Closes #699 2012-12-30 20:44:29 -08:00
Thomas Reynolds 6253c91610 Allow non-templates to have frontmatter. Closes #698 2012-12-30 20:40:20 -08:00
Thomas Reynolds 4eca29866b Copy binary files instead of rendering through MM. Closes #643. Closes #699 2012-12-30 20:37:40 -08:00
Thomas Reynolds e97d0ad0e4 Allow non-templates to have frontmatter. Closes #698 2012-12-30 20:29:39 -08:00