middleman

deac/middleman

Fork 0

Commit graph

9f7f3370aa Catch JRuby/Coffee exception correctly Thomas Reynolds 2012-07-07 17:29:31 -07:00
5cff7cd9c1 Update execjs dep, hopefully fixing therubyrhino on JRuby Thomas Reynolds 2012-07-07 16:30:50 -07:00
2282657000 Use therubyrhino for jruby execjs tests Thomas Reynolds 2012-07-07 14:31:39 -07:00
4b03c5e2df Add Middleman::Util.all_files_under to get a recursive listing of files beneath a path, follows symlinks. Fixes #515 Thomas Reynolds 2012-07-06 19:32:05 -07:00
b67d4e7c82 bump submodule [ci skip] v3.0.0.rc.4 Thomas Reynolds 2012-07-04 16:52:53 -07:00
d4259315e7 version bump [ci skip] Thomas Reynolds 2012-07-04 16:47:01 -07:00
54f796120f Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2012-07-04 16:45:32 -07:00
63224639d9 Add tests for more implied extensions Thomas Reynolds 2012-07-04 16:45:27 -07:00
d23a773491 Merge pull request #370 from bhollis/master Thomas Reynolds 2012-07-04 16:24:42 -07:00
df31f65522 Make automatic helpers smarter. Fixes #510 Thomas Reynolds 2012-07-04 11:29:00 -07:00
be2589de0d Merge pull request #284 from bhollis/layout Thomas Reynolds 2012-07-03 13:30:38 -07:00
89afc86a5b Friendlier error message when a non-default layout is not in the layouts directory. Ben Hollis 2012-07-03 00:01:11 -07:00
1229a9991a Prevent NoMethodError/NameError from hanging the server. Ben Hollis 2012-07-02 23:39:30 -07:00
a5a2e1568b point to public repo Thomas Reynolds 2012-07-02 21:46:17 -07:00
6791dc431c Let travis know we're using submodules Thomas Reynolds 2012-07-02 21:43:17 -07:00
d0cf90675a Update changelog Thomas Reynolds 2012-07-02 21:42:55 -07:00
cdca063fb8 Add middleman-sprockets as a gitmodule [no ci] Thomas Reynolds 2012-07-02 21:32:08 -07:00
1c9a97990e Update some gem requirements, lock Padrino v3.0.0.rc.3 Thomas Reynolds 2012-07-02 16:35:53 -07:00
4faa98e874 Simplify and fix relative_assets extension to work more consistently. Also, fix a bug in relative link_to inspired by fixing this bug. This fixes #507. Ben Hollis 2012-06-30 22:02:23 -07:00
dad9b33174 Merge pull request #505 from dzubi/master Ben Hollis 2012-06-28 21:58:52 -07:00
e9b996516b Fix option in build failure help message Daniel Zuberbühler 2012-06-28 14:54:14 +02:00
121715e2be Merge pull request #503 from bhollis/master Thomas Reynolds 2012-06-28 01:07:31 -07:00
2bb47049c1 Clean up listener handling in preview server Ben Hollis 2012-06-27 23:27:27 -07:00
702930484f Update changelog Ben Hollis 2012-06-27 23:26:08 -07:00
b5f6de980a Merge pull request #500 from bhollis/http_prefix Thomas Reynolds 2012-06-23 18:27:38 -07:00
6ac263619a Make :http_prefix work in link_to and asset helpers as long as the linked item is a sitemap resource. Fixes #484. Ben Hollis 2012-06-23 17:19:24 -07:00
541c5710f7 Update to latest Guard and Guard Livereload to avoid gem dependency issues v2.0.16 Thomas Reynolds 2012-06-23 12:40:23 -07:00
4706c3ad00 Fix padrino dep v2.0.15.4 Thomas Reynolds 2012-06-22 10:22:14 -07:00
f907f4acb4 Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2012-06-20 17:53:27 -07:00
8912d3627d Update Padrino to 0.10.7 and Thor to 0.15.3. Closes #495 Thomas Reynolds 2012-06-20 17:53:14 -07:00
fbc4591922 bump listen dep Thomas Reynolds 2012-06-20 09:51:19 -07:00
35ff2e0c48 bump version [no-ci] Thomas Reynolds 2012-06-19 20:12:55 -07:00
c3796a9161 :automatic_directory_matcher optionally converts a character sequence in file names into a subdirectory. Closes #491 Thomas Reynolds 2012-06-19 20:07:50 -07:00
ddc0712c1b Say :update, not :create on automatic conflict resolution Thomas Reynolds 2012-06-19 19:40:57 -07:00
bd9d9d0f93 travishatesme Thomas Reynolds 2012-06-18 16:53:22 -07:00
518ae3f46d Move encoding tests into a dynamic form so they aren't packaged with gemspecs on unsupported platforms. Thomas Reynolds 2012-06-18 15:18:16 -07:00
cf8314ecab Merge pull request #490 from rstacruz/changelog_for_3rc2 Ben Hollis 2012-06-17 15:46:45 -07:00
f74c54470d Update CHANGELOG for 3.0.0.rc.2 Rico Sta. Cruz 2012-06-18 05:13:38 +08:00
eee1e45afb bump to rc2 v3.0.0.rc.2 Thomas Reynolds 2012-06-17 12:21:24 -07:00
5da63cb84f Emit identical message on build as before, removing confusion reported in #475 Thomas Reynolds 2012-06-17 12:11:07 -07:00
5071a2c15d Tests for #477 Thomas Reynolds 2012-06-17 12:03:36 -07:00
4ea2f6f7ed Sick of jruby breaking travis Thomas Reynolds 2012-06-17 11:42:39 -07:00
10d0df2622 Fix cucumber flags in jruby Thomas Reynolds 2012-06-17 11:31:10 -07:00
bdfc270367 Merge pull request #489 from bhollis/match Thomas Reynolds 2012-06-17 11:17:41 -07:00
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. Ben Hollis 2012-06-16 20:23:33 -07:00
524fd49c47 Merge pull request #488 from bhollis/link_to Thomas Reynolds 2012-06-16 19:44:42 -07:00
8a01b28369 Improve link_to so that it can handle a Resource in place of a url. Fixes #474. Ben Hollis 2012-06-16 17:48:41 -07:00
f81b6c7c40 Merge pull request #478 from rolftimmermans/charset-fix Thomas Reynolds 2012-06-16 15:11:05 -07:00
f3f508399c Merge pull request #487 from rstacruz/listener_fix Thomas Reynolds 2012-06-16 15:10:20 -07:00
509c91999d Add ~encoding tag to cucumber to only run tests for Encoding on platforms which support it Thomas Reynolds 2012-06-16 15:09:48 -07:00
f6b55e8674 Merge pull request #486 from rstacruz/encoding_fix Thomas Reynolds 2012-06-16 15:04:54 -07:00
b35de4834b Restart the listener when reloading the server Rico Sta. Cruz 2012-06-16 06:30:11 +08:00
8a898f8239 Persist the preview servers options (like port) when reloading Rico Sta. Cruz 2012-06-16 06:20:40 +08:00
96c29181aa Implement the :encoding setting which defaults to 'utf-8' Rico Sta. Cruz 2012-06-16 06:07:44 +08:00
f4feda8b93 Merge pull request #479 from rolftimmermans/use-accepts-block Thomas Reynolds 2012-06-14 08:31:18 -07:00
b6d2579678 Use method should accept a block when adding Rack middleware. Rolf Timmermans 2012-06-14 13:53:49 +02:00
f11d21d122 Change the default character encoding to 'utf-8' instead of 'utf8' to please more browsers. Rolf Timmermans 2012-06-14 13:28:00 +02:00
ab717af590 bump deps Thomas Reynolds 2012-06-13 23:19:28 -07:00
862a56a343 Attempt address #466 and avoid Bundler issues with RVM Thomas Reynolds 2012-06-13 20:33:50 -07:00
2e5ae051e6 Merge pull request #469 from danielbayerlein/fix-compass-config Ben Hollis 2012-06-10 14:23:50 -07:00
8fefbe350b Remove double whitespace. Daniel Bayerlein 2012-06-10 00:13:04 +03:00
cc1a741eb7 Move "set :fonts_dir" from "middleman-more" to "middleman-core". Daniel Bayerlein 2012-06-09 20:30:22 +02:00
939a3287d5 bump listen dep Thomas Reynolds 2012-06-08 17:19:31 -07:00
7852d1eaf9 new extension ver v3.0.0.rc.1 Thomas Reynolds 2012-06-06 09:29:41 -07:00
ba9e24cde9 Merge pull request #458 from bhollis/i18n Thomas Reynolds 2012-06-06 09:29:50 -07:00
0d0d572c3a Rename internationalization module to avoid conflict with regular I18n module. Fixes #458. Ben Hollis 2012-06-05 19:11:05 -07:00
092a82157d bump bundler dep, try to track down JRuby 1.9 encoding weirdness Thomas Reynolds 2012-06-05 16:48:58 -07:00
949c5db915 The Middleman Cometh Thomas Reynolds 2012-06-05 16:28:01 -07:00
e6256d0178 --help should work in CLI Thomas Reynolds 2012-06-05 11:48:34 -07:00
aa0d848ba5 Don't test Less on JRuby Thomas Reynolds 2012-06-05 10:28:09 -07:00
286c7352b6 Fix Less load paths, simplify builder error output. Fixes #461 Thomas Reynolds 2012-06-05 10:24:00 -07:00
556f82afbc Remove redundant extension version checking, we're using Bundler now Thomas Reynolds 2012-06-03 12:19:43 -07:00
02871f5fcc Avoid JRuby whitespace issue Thomas Reynolds 2012-06-02 15:32:04 -07:00
e26b68635f Haml wrap_layout passes again Thomas Reynolds 2012-06-02 14:19:45 -07:00
239f80c1f9 Merge pull request #457 from bhollis/wrap_layout Thomas Reynolds 2012-06-02 01:02:03 -07:00
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. Ben Hollis 2012-06-02 00:35:03 -07:00
f287e0a2bc Don't asset_hash ico and manifest. Now with tests to prevent another regression. Ben Hollis 2012-06-01 23:54:57 -07:00
2ab294c602 Fix wrap_layout for all know templating engines. Fixes #417 Thomas Reynolds 2012-06-01 20:05:07 -07:00
9b5d1f17d0 Test showing wrap_layout is still broken when used with haml Ben Hollis 2012-03-25 01:02:46 -07:00
d8d4769702 Fix nested layouts for ERB Ben Hollis 2012-03-24 23:41:37 -07:00
deb6bddaf6 Pathname.exist? != File.exists? Thomas Reynolds 2012-06-01 19:05:32 -07:00
00f232cf20 Merge pull request #450 from middleman/file_watcher_use_pathname Thomas Reynolds 2012-06-01 18:57:21 -07:00
f9b7188986 Bump activesupport Thomas Reynolds 2012-05-31 19:11:12 -07:00
2535ce2c90 fix // search and replace typo Thomas Reynolds 2012-05-28 22:01:36 -07:00
b02ee61639 Weird block scoping issue in old Ruby Thomas Reynolds 2012-05-28 14:09:43 -07:00
51e1de54f6 Be more defensive against middleman-sprockets missing Thomas Reynolds 2012-05-28 13:30:54 -07:00
67e78f20c7 Move renderers into core, but don't require gems and only register templates if gems present Thomas Reynolds 2012-05-28 13:19:40 -07:00
2e5b0d75a9 Use pathname consistently in file watcher Thomas Reynolds 2012-05-25 18:18:51 -07:00
c3c662cf44 adapt minify_css test to compass line_comments change Thomas Reynolds 2012-05-26 15:15:53 -07:00
98fc81beef Implement and test asset_hash ignore option Thomas Reynolds 2012-05-26 15:08:59 -07:00
0788ebce15 Avoid layouts on sass Thomas Reynolds 2012-05-26 14:27:26 -07:00
3b847696ff Load from root bundler when running from git Thomas Reynolds 2012-05-26 14:15:36 -07:00
1d90d03dd8 Merge pull request #429 from middleman/extract_sprockets Thomas Reynolds 2012-05-26 13:44:06 -07:00
8d483f882c Move Sprockets into an extension Thomas Reynolds 2012-05-24 14:29:29 -07:00
f8c64f25ec Put test ENV in the right place so cucumber/rake both work Thomas Reynolds 2012-05-25 18:19:11 -07:00
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 Thomas Reynolds 2012-05-25 13:17:22 -07:00
dcdbf3e110 change json frontmatter delimeter to the ironic ;;; to avoid interfering with mustache {{{ Thomas Reynolds 2012-05-25 12:52:04 -07:00
d79acc7a78 Make i18n a normal extension with options Thomas Reynolds 2012-05-24 16:51:36 -07:00
64f84bacd2 asset urls, padrino helpers and i18n belong in more Thomas Reynolds 2012-05-24 16:31:21 -07:00
1cad726c81 Move off-by-default extensions into middleman-more, make middleman-more itself an extension Thomas Reynolds 2012-05-24 16:14:17 -07:00