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

1604 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds bd9d9d0f93 travishatesme 2012-06-18 16:53:22 -07:00
Thomas Reynolds 518ae3f46d Move encoding tests into a dynamic form so they aren't packaged with gemspecs on unsupported platforms. 2012-06-18 15:18:16 -07:00
Ben Hollis cf8314ecab Merge pull request #490 from rstacruz/changelog_for_3rc2 
Update CHANGELOG for 3.0.0.rc.2
 2012-06-17 15:46:45 -07:00
Rico Sta. Cruz f74c54470d Update CHANGELOG for 3.0.0.rc.2 2012-06-18 05:16:52 +08:00
Thomas Reynolds eee1e45afb bump to rc2 2012-06-17 12:21:24 -07:00
Thomas Reynolds 5da63cb84f Emit identical message on build as before, removing confusion reported in #475 2012-06-17 12:11:07 -07:00
Thomas Reynolds 5071a2c15d Tests for #477 2012-06-17 12:03:36 -07:00
Thomas Reynolds 4ea2f6f7ed Sick of jruby breaking travis 2012-06-17 11:42:39 -07:00
Thomas Reynolds 10d0df2622 Fix cucumber flags in jruby 2012-06-17 11:31:10 -07:00
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