Ryunosuke SATO
1e64e8022e
Support directory name as a data key
2013-03-23 17:17:34 +09:00
Thomas Reynolds
cd539f4e91
Merge pull request #835 from artm/need_reload_fix
...
fix 'needs_to_reload?' regexps
2013-03-22 11:13:07 -07:00
Artem Baguinski
e07bd036d1
just call needs_to_reload? once
2013-03-22 18:28:38 +01:00
Thomas Reynolds
a9a15caeae
Merge pull request #834 from tricknotes/fix-code-comment
...
Fix code comment
2013-03-22 10:23:12 -07:00
Artem Baguinski
e169f88a5a
fix 'needs_to_reload?' regexps
...
- remove stray ^ that would cause regexp to never match
- remove '_helper' suffix as it isn't required for helpers
2013-03-22 18:22:16 +01:00
Ryunosuke SATO
f7f281de39
Fix code comment
2013-03-22 18:14:10 +09:00
Thomas Reynolds
bef30685e0
Merge pull request #831 from tricknotes/modify-filetype
...
Modify filetype
2013-03-21 13:17:42 -07:00
Ryunosuke SATO
de7b58e210
Modify filetype
...
These files shouldn't have execute authority.
- .gitignore
- LICENSE
2013-03-22 00:57:28 +09:00
Thomas Reynolds
63a13e1e66
coffee test
2013-03-20 09:52:31 -07:00
Thomas Reynolds
0a1751fff0
change i18n dep again
2013-03-20 08:57:32 -07:00
Thomas Reynolds
f83bcad312
loosen dep
2013-03-20 08:54:28 -07:00
Thomas Reynolds
c4cf672640
Remove Rainpress pure ruby CSS compressor and simply use SCSS :)
2013-03-19 16:23:10 -07:00
Thomas Reynolds
16d6ac156c
looser test deps
2013-03-18 14:21:06 -07:00
Thomas Reynolds
f2f3ad21b6
bump tilt requirement, unregister plaintext template. fixes #824
2013-03-18 14:12:49 -07:00
Ben Hollis
546c1fdafc
Merge pull request #825 from michaelbaudino/change-default-and-html5-templates-to-use-current_page.data.title
...
Changed 'default' and 'html5' templates to use 'current_page.data.title' instead of 'data.page.title'
2013-03-17 16:05:29 -07:00
Michael Baudino
d8d34b6c74
Changed 'default' and 'html5' templates to use 'current_page.data.title' instead of 'data.page.title'
...
Related to middleman/middleman-blog#107
2013-03-17 18:18:59 +01:00
Ben Hollis
659f063076
Include file extension in template cache. May fix #798
2013-03-14 23:21:58 -07:00
Ben Hollis
6672c1c324
Merge branch '3.0-stable'
2013-03-10 16:32:55 -07:00
Ben Hollis
46f060ab12
Don't require securerandom - not sure what it was there for, but its not available in JRuby
2013-03-10 16:32:24 -07:00
Ben Hollis
3ce35149ec
Merge pull request #806 from kevin8t8/3.0-stable
...
Fix dynamic multi-byte utf-8 files rebuilding.
2013-03-03 19:07:55 -08:00
Kevin McCarthy
7608275089
Fix dynamic multi-byte utf-8 files rebuilding.
...
Thor compares the new contents with the existing file by using
File.binread(destination) == new_content.
File.binread returns a string with ASCII_8BIT encoding, which will not
match the new_content if new_content contains multi-byte utf-8.
This patch simply encodes the new_content to ASCII_8BIT before passing
it to Thor.
2013-03-03 18:13:41 -08:00
Ben Hollis
9a72036655
Merge branch '3.0-stable'
2013-03-03 12:57:48 -08:00
Ben Hollis
9fb54fcf5a
Force locale to english for number_to_human_size in the gzip extension. Fixes #804 .
2013-03-03 12:57:21 -08:00
Ben Hollis
34fe18e56c
Don't use the logger from a trap context. Fixes #801 .
2013-03-03 12:33:30 -08:00
Ben Hollis
a10c8aa194
Don't use the logger from a trap context. Fixes #801 .
2013-03-03 12:31:42 -08:00
Ben Hollis
cda8bd759d
Allow Haml 4 on master too
2013-03-02 23:34:57 -08:00
Ben Hollis
4745418200
Merge remote-tracking branch 'origin/3.0-stable'
...
Conflicts:
.travis.yml
Gemfile
middleman-core/lib/middleman-core/version.rb
middleman-core/middleman-core-x86-mingw32.gemspec
middleman-core/middleman-core.gemspec
2013-03-02 22:32:03 -08:00
Ben Hollis
3928b209ef
Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type.
2013-03-02 22:28:27 -08:00
Thomas Reynolds
de955aa0c3
try again
2013-02-27 13:20:26 -08:00
Thomas Reynolds
a24397d45b
avoid broken version of i18n gem
2013-02-27 13:02:57 -08:00
Thomas Reynolds
0525902e43
what about no https travis?
2013-02-24 16:13:31 -08:00
Thomas Reynolds
5817df96de
bump
2013-02-24 15:21:55 -08:00
Thomas Reynolds
1def1fc1f0
update sprockets dep
2013-02-24 14:20:28 -08:00
Thomas Reynolds
18849c2eea
loosen testing deps
2013-02-24 13:55:59 -08:00
Thomas Reynolds
6cee2d74f5
adapt to bundler changes, add ruby 2.0 to tests, prep release
2013-02-24 13:44:24 -08:00
Thomas Reynolds
dd63ba164e
Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable
2013-02-24 13:37:30 -08:00
Karl Freeman
6f5804d6b2
Bundler advises not to use a source symbol anymore
...
- d30026e9c8
2013-02-24 13:35:43 -08:00
Thomas Reynolds
0f80965ae3
latest listen supports new wdm
2013-02-24 13:34:07 -08:00
Thomas Reynolds
45905f2599
Merge pull request #795 from middleman/deprecate-gemfile-symbol
...
Bundler advises not to use a source symbol anymore
2013-02-24 13:30:04 -08:00
Karl Freeman
13c58a3ad5
Bundler advises not to use a source symbol anymore
...
- d30026e9c8
2013-02-24 19:13:54 +00:00
Thomas Reynolds
8d5ac575f6
prep pre
2013-02-20 13:15:38 -08:00
Thomas Reynolds
aa2102cbb7
update listen dep
2013-02-19 17:14:10 -08:00
Thomas Reynolds
f0e76c85d0
Merge pull request #789 from bhollis/haml
...
Support Haml 4. Tests only run with Haml 4 now.
2013-02-19 17:03:43 -08:00
Ben Hollis
9057b7a85e
Support Haml 4. Tests only run with Haml 4 now. Fixes #783
2013-02-17 19:40:17 -08:00
Ben Hollis
aa10991b78
Update CHANGELOG for 3.0.12
2013-02-17 18:22:17 -08:00
Ben Hollis
1d3503b56c
OK maybe not Rubinius
2013-02-15 23:00:53 -08:00
Ben Hollis
f791733cc6
Constrain HAML
2013-02-15 22:26:46 -08:00
Ben Hollis
00f23cad8e
Test on more rubies
2013-02-15 22:15:13 -08:00
Ben Hollis
c48ac06526
Merge pull request #776 from bhollis/config_meta
...
Add a metadata page for inspecting configuration.
2013-02-14 08:52:07 -08:00
Ben Hollis
ff971dd327
Merge pull request #775 from bhollis/console
...
Add an experimental "console" CLI command.
2013-02-14 08:51:48 -08:00
