1395 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thomas Reynolds	bdfc270367	Merge pull request #489 from bhollis/match ... Add a Middleman::Util.path_match function and use it	2012-06-17 11:17:41 -07:00
Ben Hollis	57f5701e72	Add a Middleman::Util.path_match function that handles matching on regexes, globs, and procs, and use it from asset_hash, minify_javascript, and minify_css. Fixes #480.	2012-06-16 20:26:42 -07:00
Thomas Reynolds	524fd49c47	Merge pull request #488 from bhollis/link_to ... Improve link_to so that it can handle a Resource in place of a url	2012-06-16 19:44:42 -07:00
Ben Hollis	8a01b28369	Improve link_to so that it can handle a Resource in place of a url. Fixes #474.	2012-06-16 17:48:41 -07:00
Thomas Reynolds	f81b6c7c40	Merge pull request #478 from rolftimmermans/charset-fix ... Change the default character encoding to 'utf-8', with a dash	2012-06-16 15:11:05 -07:00
Thomas Reynolds	f3f508399c	Merge pull request #487 from rstacruz/listener_fix ... Fix the listener/watcher	2012-06-16 15:10:20 -07:00
Thomas Reynolds	509c91999d	Add ~encoding tag to cucumber to only run tests for Encoding on platforms which support it	2012-06-16 15:09:48 -07:00
Thomas Reynolds	f6b55e8674	Merge pull request #486 from rstacruz/encoding_fix ... Implement the :encoding setting which defaults to 'utf-8'	2012-06-16 15:04:54 -07:00
Rico Sta. Cruz	b35de4834b	Restart the listener when reloading the server	2012-06-16 06:30:20 +08:00
Rico Sta. Cruz	8a898f8239	Persist the preview servers options (like port) when reloading	2012-06-16 06:20:40 +08:00
Rico Sta. Cruz	96c29181aa	Implement the :encoding setting which defaults to 'utf-8'	2012-06-16 06:07:50 +08:00
Thomas Reynolds	f4feda8b93	Merge pull request #479 from rolftimmermans/use-accepts-block ... Use method should accept a block when adding Rack middleware.	2012-06-14 08:31:18 -07:00
Rolf Timmermans	b6d2579678	Use method should accept a block when adding Rack middleware.	2012-06-14 13:53:49 +02:00
Rolf Timmermans	f11d21d122	Change the default character encoding to 'utf-8' instead of 'utf8' to please more browsers.	2012-06-14 13:28:00 +02:00
Thomas Reynolds	ab717af590	bump deps	2012-06-13 23:19:28 -07:00
Thomas Reynolds	862a56a343	Attempt address #466 and avoid Bundler issues with RVM	2012-06-13 20:33:50 -07:00
Ben Hollis	2e5ae051e6	Merge pull request #469 from danielbayerlein/fix-compass-config ... Can not start the middleman server when i use the latest version of Compass (0.12.2.rc.1)	2012-06-10 14:23:50 -07:00
Daniel Bayerlein	8fefbe350b	Remove double whitespace.	2012-06-10 00:13:04 +03:00
Daniel Bayerlein	cc1a741eb7	Move "set :fonts_dir" from "middleman-more" to "middleman-core".	2012-06-09 20:30:22 +02:00
Thomas Reynolds	939a3287d5	bump listen dep	2012-06-08 17:19:31 -07:00
Thomas Reynolds	7852d1eaf9	new extension ver	2012-06-06 09:30:06 -07:00
Thomas Reynolds	ba9e24cde9	Merge pull request #458 from bhollis/i18n ... Cannot access I18n from helpers anymore	2012-06-06 09:29:50 -07:00
Ben Hollis	0d0d572c3a	Rename internationalization module to avoid conflict with regular I18n module. Fixes #458.	2012-06-05 22:00:16 -07:00
Thomas Reynolds	092a82157d	bump bundler dep, try to track down JRuby 1.9 encoding weirdness	2012-06-05 16:48:58 -07:00
Thomas Reynolds	949c5db915	The Middleman Cometh	2012-06-05 16:28:01 -07:00
Thomas Reynolds	e6256d0178	--help should work in CLI	2012-06-05 11:48:34 -07:00
Thomas Reynolds	aa0d848ba5	Don't test Less on JRuby	2012-06-05 10:28:09 -07:00
Thomas Reynolds	286c7352b6	Fix Less load paths, simplify builder error output. Fixes #461	2012-06-05 10:24:00 -07:00
Thomas Reynolds	556f82afbc	Remove redundant extension version checking, we're using Bundler now	2012-06-03 12:19:43 -07:00
Thomas Reynolds	02871f5fcc	Avoid JRuby whitespace issue	2012-06-02 15:32:04 -07:00
Thomas Reynolds	e26b68635f	Haml wrap_layout passes again	2012-06-02 14:19:45 -07:00
Thomas Reynolds	239f80c1f9	Merge pull request #457 from bhollis/wrap_layout ... Update nested_layout tests to show that Haml still doesn't work right	2012-06-02 01:02:03 -07:00
Ben Hollis	efa846341d	Update nested_layout tests to show that Haml still doesn't work right. Also updated Slim and ERb tests to verify ordering of output.	2012-06-02 00:35:03 -07:00
Ben Hollis	f287e0a2bc	Don't asset_hash ico and manifest. Now with tests to prevent another regression.	2012-06-01 23:54:57 -07:00
Thomas Reynolds	2ab294c602	Fix wrap_layout for all know templating engines. Fixes #417	2012-06-01 20:08:28 -07:00
Ben Hollis	9b5d1f17d0	Test showing wrap_layout is still broken when used with haml	2012-06-01 19:05:55 -07:00
Ben Hollis	d8d4769702	Fix nested layouts for ERB	2012-06-01 19:05:55 -07:00
Thomas Reynolds	deb6bddaf6	Pathname.exist? != File.exists?	2012-06-01 19:05:32 -07:00
Thomas Reynolds	00f232cf20	Merge pull request #450 from middleman/file_watcher_use_pathname ... Use pathname consistently in file watcher	2012-06-01 18:57:21 -07:00
Thomas Reynolds	f9b7188986	Bump activesupport	2012-05-31 19:11:12 -07:00
Thomas Reynolds	2535ce2c90	fix // search and replace typo	2012-05-28 22:01:36 -07:00
Thomas Reynolds	b02ee61639	Weird block scoping issue in old Ruby	2012-05-28 14:09:43 -07:00
Thomas Reynolds	51e1de54f6	Be more defensive against middleman-sprockets missing	2012-05-28 13:30:54 -07:00
Thomas Reynolds	67e78f20c7	Move renderers into core, but don't require gems and only register templates if gems present	2012-05-28 13:19:40 -07:00
Thomas Reynolds	2e5b0d75a9	Use pathname consistently in file watcher	2012-05-26 17:48:58 -07:00
Thomas Reynolds	c3c662cf44	adapt minify_css test to compass line_comments change	2012-05-26 15:15:53 -07:00
Thomas Reynolds	98fc81beef	Implement and test asset_hash ignore option	2012-05-26 15:08:59 -07:00
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