Commit graph

1636 commits

Author SHA1 Message Date
Thomas Reynolds
2d28272396 Merge pull request #736 from bhollis/master
Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type.
2013-01-22 23:14:15 -08:00
Ben Hollis
00581876b5 Merge pull request #740 from stevenosloan/add_htpasswd
also "build" .htpasswd files
2013-01-18 19:56:27 -08:00
Steven Sloan
c121c407df also "build" .htpasswd files 2013-01-18 20:13:49 -05:00
Ben Hollis
16b3a729cd Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type. 2013-01-17 19:40:39 -08:00
Thomas Reynolds
cad7f8a0a4 disable cane 2013-01-14 23:33:33 -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
7c1d55cb38 merge 2013-01-13 12:00:25 -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
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
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
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
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
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
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
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
a537b434e3 Coerce all paths in sitemap to Pathname 2012-12-30 19:59:41 -08:00
Thomas Reynolds
1c62dd68a7 Simplify bundler init. Closes #700 2012-12-30 19:58:37 -08:00
Ben Hollis
b6c33abda1 Merge pull request #657 from bhollis/link_to
URL not being parsed when using a link with a hash with link_to helper
2012-12-30 19:47:15 -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
a00d507de3 Clean up styling a bit, add extension hooks 2012-12-25 16:11:52 -08:00
Ben Hollis
142abe027e Switch to using view classes isntead of partials 2012-12-25 16:11:52 -08:00
Ben Hollis
b8eb932a73 Hierarchical sitemap 2012-12-25 16:11:52 -08:00
Ben Hollis
22fcc3c108 Initial spike for meta pages 2012-12-25 16:11:52 -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
ad1806ccc0 Merge pull request #650 from middleman/sitemap_query
Make Sitemap metadata queryable with arel-style API
2012-12-25 16:06:22 -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
78150b9103 Merge branch 'master' of github.com:middleman/middleman 2012-12-19 14:01:25 -08:00
Thomas Reynolds
41ae1053eb Remove dependency on compiled file watchers, will fall back to polling by default. This keeps Middleman from needing a compiler to install. Will ask user to upgrade to a compiled watcher on install. 2012-12-19 14:01:05 -08:00
Thomas Reynolds
bd47af5744 alternative asset_host initializer 2012-12-19 09:42:55 -08:00
Thomas Reynolds
642ee42b4f Merge pull request #689 from wazeHQ/fix_asset_hash_ignore
fix Middleman::Util.path_match to work with string matchers
2012-12-18 15:21:27 -08:00
Avia Aharon
b084982923 fix Middleman::Util.path_match to work with string matchers 2012-12-18 12:32:13 +02:00
Avia Aharon
6e44851069 test asset_hash ignored paths 2012-12-18 12:28:17 +02:00
Thomas Reynolds
94e9bc1a17 update changelog 2012-12-15 15:00:46 -08:00