Commit graph

1398 commits

Author SHA1 Message Date
Thomas Reynolds 0788ebce15 Avoid layouts on sass 2012-05-26 14:27:26 -07:00
Thomas Reynolds 3b847696ff Load from root bundler when running from git 2012-05-26 14:15:36 -07:00
Thomas Reynolds 1d90d03dd8 Merge pull request #429 from middleman/extract_sprockets
Move Sprockets into an extension
2012-05-26 13:44:06 -07:00
Thomas Reynolds 8d483f882c Move Sprockets into an extension 2012-05-26 13:43:27 -07:00
Thomas Reynolds f8c64f25ec Put test ENV in the right place so cucumber/rake both work 2012-05-25 18:19:11 -07:00
Thomas Reynolds b5b6349220 Only allow frontmatter on first line, unless we have a ruby 1.9 encoding comment, then allow it on the second line. Fixes #446 2012-05-25 13:17:22 -07:00
Thomas Reynolds dcdbf3e110 change json frontmatter delimeter to the ironic ;;; to avoid interfering with mustache {{{ 2012-05-25 12:52:04 -07:00
Thomas Reynolds d79acc7a78 Make i18n a normal extension with options 2012-05-24 16:51:36 -07:00
Thomas Reynolds 64f84bacd2 asset urls, padrino helpers and i18n belong in more 2012-05-24 16:31:21 -07:00
Thomas Reynolds 1cad726c81 Move off-by-default extensions into middleman-more, make middleman-more itself an extension 2012-05-24 16:14:17 -07:00
Thomas Reynolds 182ad87ad3 Catch Psych::SyntaxError. Related to #446 2012-05-24 14:04:25 -07:00
Thomas Reynolds bb659bb5be jruby 1.9 fixed itself? 2012-05-24 11:33:51 -07:00
Thomas Reynolds 94c5f32853 Re-arrange CLI loads for hopefully faster startup time 2012-05-24 11:18:49 -07:00
Thomas Reynolds fffa80a987 Backwards compatibility with old Rack aPI. Fixes #447 2012-05-24 11:01:46 -07:00
Thomas Reynolds b202e71348 Preview server must set environment as a symbol. Fixes #445 2012-05-24 10:34:46 -07:00
Thomas Reynolds 220bb5edb2 add some sprockets update tests 2012-05-24 10:24:36 -07:00
Thomas Reynolds 4b818ea230 Fix Sass Syntax error module path. Fixes #444 2012-05-23 14:37:57 -07:00
Thomas Reynolds 955eb03908 Remove double NAME in extension cli task 2012-05-23 10:35:16 -07:00
Thomas Reynolds fd80027af6 idiot-proof maruku smarty pants test 2012-05-22 19:40:31 -07:00
Thomas Reynolds 2c058ee3de Couple of fixes, specifically an issue with frontmatter layout setting 2012-05-22 19:11:54 -07:00
Thomas Reynolds f0d781cce3 Implement our own Redcarpet Template to support renderer-level options. Closes #442 2012-05-22 14:50:37 -07:00
Ben Hollis 045f25fa4e Ignore apple-touch-icon files from asset_hash 2012-05-20 21:01:35 -07:00
Ben Hollis 340922659a Don't include ico and manifest in asset_hash by default 2012-05-19 23:47:26 -07:00
Ben Hollis 2b2759fb77 Don't accidentally start a new file listener every time the server reloads 2012-05-19 23:17:13 -07:00
Ben Hollis e766e753e8 Fix file watcher by referencing the right list of paths 2012-05-19 23:05:06 -07:00
Ben Hollis 7598165909 Write directory_indexes based on destination_path so it plays well with other manipulators 2012-05-19 22:05:58 -07:00
Thomas Reynolds c117415913 Merge pull request #436 from middleman/rack_reloader
Rely on Webrick directly for preview, makes quick app reloading simple.
2012-05-19 22:01:39 -07:00
Thomas Reynolds 671dcde65f Merge pull request #438 from bhollis/link_to
Make link_to magical
2012-05-19 19:43:42 -07:00
Thomas Reynolds 3412af346e Rely on Webrick directly for preview, makes quick app reloading simple. 2012-05-19 19:41:22 -07:00
Ben Hollis c775a9973c Handle relative path urls in link_to, and add an option to produce relative links as well. Or, set :relative_links in config.rb to turn on relative links for all link_to calls. 2012-05-19 19:24:37 -07:00
Thomas Reynolds b912fa9cac Merge pull request #435 from bhollis/frontmatter
Frontmatter fixes
2012-05-19 18:52:29 -07:00
Ben Hollis fc9c5e5fa2 Properly clear frontmatter cache when files change, and calculate frontmatter in the right order so resource_list_manipulators can see it. 2012-05-19 18:47:43 -07:00
Ben Hollis 7ad0f51d1a Always return HashWithIndifferentAccess from frontmatter data 2012-05-19 18:46:58 -07:00
Thomas Reynolds 3356153d55 Merge pull request #434 from bhollis/asset_hash
Add an option to asset_hash to allow excluding files
2012-05-19 16:59:09 -07:00
Ben Hollis 9b93bf2498 Add an option to asset_hash to allow excluding files that would otherwise get hashes appended to their filenames. 2012-05-19 15:35:27 -07:00
Thomas Reynolds 8fb4888f8c Merge pull request #433 from bhollis/server
Remove duplicate server methods and solve webrick logging in a platform-independent way
2012-05-17 11:36:09 -07:00
Ben Hollis 64a2933161 Remove duplicate server methods and solve webrick logging in a platform-independent way 2012-05-16 21:19:03 -07:00
Thomas Reynolds 8c87bbc757 Handle .htc files [no-ci] 2012-05-12 08:48:03 -07:00
Thomas Reynolds 72cb264e39 Merge pull request #427 from bhollis/windows
Log to NUL: in Windows
2012-05-11 07:59:43 -07:00
Ben Hollis 8d101552f3 Log to NUL: in Windows because apparently that's their name for /dev/null. Fixes #421 2012-05-10 22:12:55 -07:00
Thomas Reynolds 024d33c16e Bump cucumber dep [no-ci] 2012-05-10 20:18:18 -07:00
Thomas Reynolds 1022e63cee Avoid bundler on travis 2012-05-10 16:32:43 -07:00
Thomas Reynolds ed50d4326a Try to avoid running bundler in tests on Travis 2012-05-10 16:07:11 -07:00
Thomas Reynolds d4bccd76ab Don't hide bundler output [no-ci] 2012-05-10 15:07:19 -07:00
Thomas Reynolds 190be5f515 Bundler CLI commands 2012-05-10 15:06:06 -07:00
Thomas Reynolds 7c8baee246 Ignore ~ temp files [no-ci] 2012-05-10 14:05:28 -07:00
Thomas Reynolds f0b4e56b80 Require latest execjs to avoid MultiJson warnings 2012-05-10 11:31:35 -07:00
Thomas Reynolds 3f048011ab Stop testing on Rubinius 2012-05-10 11:25:21 -07:00
Thomas Reynolds 162622c453 JSON frontmatter and allowing frontmatter to be located after a encoding value 2012-05-09 13:33:14 -07:00
Thomas Reynolds f17b19d9de Merge pull request #416 from middleman/frontmatter_refactor
Refactor Sitemap to run on any template file, be more error tolerant and use less code/memory
2012-05-08 21:11:03 -07:00