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

1620 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thomas Reynolds 054ce83d35 Fix html5bp test 2012-12-15 14:49:50 -08:00
Thomas Reynolds d119ac1f5f Merge pull request #678 from barraponto/html5-layout 
turn html5 boilerplate into a layout
 2012-12-15 14:42:38 -08:00
Capi Etheriel 60fc4ce43a turn html5 boilerplate into a layout 
set hbp5 as the DEFAULT layout

use titles from YAML options
 2012-12-14 11:39:35 -02:00
Ben Hollis 0801f93ffb Merge pull request #677 from CaseyLeask/empty-yaml 
Empty yaml fix
 2012-12-13 19:45:00 -08:00
Thomas Reynolds fd8855eff0 Lock therubyracer for now 2012-12-14 14:22:43 +11:00
Thomas Reynolds 19c0eeeffd disable cane (Ruby 1.8 travis issues) 2012-12-14 14:22:43 +11:00
Casey Leask 85f06ccecd Added fix for empty YAML 2012-12-14 14:22:42 +11:00
Thomas Reynolds 865c2c34f9 Lock therubyracer for now 2012-12-08 14:08:10 -08:00
Thomas Reynolds 42709eacb1 disable cane (Ruby 1.8 travis issues) 2012-12-02 16:29:55 -08:00
Thomas Reynolds 1439241661 update donation link 2012-11-16 13:28:43 +00:00
Ben Hollis 4ef92481af Merge pull request #665 from techthumb/master 
Changed log message when middleman starts.
 2012-11-11 18:01:15 -08:00
Kunal Parikh e57564c957 Using 'Socket.gethostname' to get default hostname 
As suggested by @bhollis in https://github.com/middleman/middleman/pull/665#issuecomment-10262763
 2012-11-11 15:54:32 +11:00
Kunal Parikh 1761197af3 Changed log message when middleman starts. 
Old message: == The Middleman is standing watch on port 4567
New message: == The Middleman is standing watch at http://0.0.0.0:4567

The URL in the message makes it clickable if the terminal supports it.
 2012-11-11 13:16:47 +11:00
Ben Hollis 434895be0c Merge pull request #663 from alexpeattie/slim-redcarpet-fix 
Fix for embedded Markdown in Slim w/ Redcarpet
 2012-11-07 22:01:33 -08:00
Alex Peattie ecefe2a04e Fix for embedded Markdown in Slim w/ Redcarpet 2012-11-07 11:30:24 -08:00
Thomas Reynolds 3f1fa496b2 Merge pull request #660 from bitgangsta/fix_svg 
Fixing automatic_image_sizes to eliminate warnings on vector images
 2012-11-06 14:41:38 -08:00