Thomas Reynolds
54f796120f
Merge branch 'master' of github.com:middleman/middleman
2012-07-04 16:45:32 -07:00
Thomas Reynolds
63224639d9
Add tests for more implied extensions
2012-07-04 16:45:27 -07:00
Thomas Reynolds
d23a773491
Merge pull request #370 from bhollis/master
...
Syntax errors lock up Middleman
2012-07-04 16:24:42 -07:00
Thomas Reynolds
df31f65522
Make automatic helpers smarter. Fixes #510
2012-07-04 11:29:00 -07:00
Ben Hollis
89afc86a5b
Friendlier error message when a non-default layout is not in the layouts directory.
2012-07-03 00:01:11 -07:00
Ben Hollis
1229a9991a
Prevent NoMethodError/NameError from hanging the server.
...
The fix is to work around this bug: http://bugs.ruby-lang.org/issues/4521 where Ruby will call to_s/inspect while printing exception messages, which can take a long time (minutes at full CPU) if the object is huge or has cyclic references, like Middleman::Application does. Defining #to_s short-circuits that. This fixes #370 .
2012-07-02 23:39:30 -07:00
Daniel Zuberbühler
e9b996516b
Fix option in build failure help message
2012-06-28 14:57:35 +02:00
Ben Hollis
2bb47049c1
Clean up listener handling in preview server
2012-06-27 23:28:28 -07:00
Ben Hollis
6ac263619a
Make :http_prefix work in link_to and asset helpers as long as the linked item is a sitemap resource. Fixes #484 .
2012-06-23 17:19:24 -07:00
Thomas Reynolds
8912d3627d
Update Padrino to 0.10.7 and Thor to 0.15.3. Closes #495
2012-06-20 17:53:14 -07:00
Thomas Reynolds
35ff2e0c48
bump version [no-ci]
2012-06-19 20:12:55 -07:00
Thomas Reynolds
c3796a9161
:automatic_directory_matcher optionally converts a character sequence in file names into a subdirectory. Closes #491
2012-06-19 20:07:50 -07:00
Thomas Reynolds
ddc0712c1b
Say :update, not :create on automatic conflict resolution
2012-06-19 19:40:57 -07: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
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
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
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
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
862a56a343
Attempt address #466 and avoid Bundler issues with RVM
2012-06-13 20:33:50 -07:00
Daniel Bayerlein
cc1a741eb7
Move "set :fonts_dir" from "middleman-more" to "middleman-core".
2012-06-09 20:30:22 +02:00
Thomas Reynolds
7852d1eaf9
new extension ver
2012-06-06 09:30:06 -07:00
Thomas Reynolds
949c5db915
The Middleman Cometh
2012-06-05 16:28:01 -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
e26b68635f
Haml wrap_layout passes again
2012-06-02 14:19:45 -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
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
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
8d483f882c
Move Sprockets into an extension
2012-05-26 13:43:27 -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
94c5f32853
Re-arrange CLI loads for hopefully faster startup time
2012-05-24 11:18:49 -07:00
