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 |
|
|
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 |
|
|
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
|
bb659bb5be
|
jruby 1.9 fixed itself?
|
2012-05-24 11:33:51 -07:00 |
|
|
Thomas Reynolds
|
94c5f32853
|
Re-arrange CLI loads for hopefully faster startup time
|
2012-05-24 11:18:49 -07:00 |
|
|
Thomas Reynolds
|
fffa80a987
|
Backwards compatibility with old Rack aPI. Fixes #447
|
2012-05-24 11:01:46 -07:00 |
|
|
Thomas Reynolds
|
b202e71348
|
Preview server must set environment as a symbol. Fixes #445
|
2012-05-24 10:34:46 -07:00 |
|
|
Thomas Reynolds
|
220bb5edb2
|
add some sprockets update tests
|
2012-05-24 10:24:36 -07:00 |
|
|
Thomas Reynolds
|
4b818ea230
|
Fix Sass Syntax error module path. Fixes #444
|
2012-05-23 14:37:57 -07:00 |
|
|
Thomas Reynolds
|
955eb03908
|
Remove double NAME in extension cli task
|
2012-05-23 10:35:16 -07:00 |
|
|
Thomas Reynolds
|
fd80027af6
|
idiot-proof maruku smarty pants test
|
2012-05-22 19:40:31 -07:00 |
|
|
Thomas Reynolds
|
2c058ee3de
|
Couple of fixes, specifically an issue with frontmatter layout setting
|
2012-05-22 19:11:54 -07:00 |
|
|
Thomas Reynolds
|
f0d781cce3
|
Implement our own Redcarpet Template to support renderer-level options. Closes #442
|
2012-05-22 14:50:37 -07:00 |
|
|
Ben Hollis
|
045f25fa4e
|
Ignore apple-touch-icon files from asset_hash
|
2012-05-20 21:01:35 -07:00 |
|
|
Ben Hollis
|
340922659a
|
Don't include ico and manifest in asset_hash by default
|
2012-05-19 23:47:26 -07:00 |
|
|
Ben Hollis
|
2b2759fb77
|
Don't accidentally start a new file listener every time the server reloads
|
2012-05-19 23:17:13 -07:00 |
|