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
|
f907f4acb4
|
Merge branch 'master' of github.com:middleman/middleman
|
2012-06-20 17:53:27 -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
|
fbc4591922
|
bump listen dep
|
2012-06-20 09:51:19 -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
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
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 |
|