deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2067 commits 11 branches 271 tags 23 MiB
Commit graph

2067 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Hollis
c2ffa538ad Undo my previous change, apparently it is no good 2013-04-04 23:28:28 -07:00
Ben Hollis
f7d1471edb Handle empty frontmatter without logging an exception 2013-04-04 22:59:05 -07:00
Ben Hollis
f89c815868 More agressively set the context for our custom Markdown renderer, and fall back if we still don't manage to get it right. Fixes #662. 2013-04-04 22:48:09 -07:00
Ben Hollis
fca4c0330e Merge pull request #849 from stevenosloan/markdown_filter_in_haml 
Markdown filter support for Haml 4
 2013-04-04 22:43:16 -07:00
Steven Sloan
6043392e1a add feature tests for markdown support in haml 2013-04-04 15:16:01 -04:00
Ben Hollis
70643dcc32 Merge pull request #846 from argent-smith/master 
Added .idea to .gitignore
 2013-04-03 22:06:14 -07:00
Thomas Reynolds
087872d286 Merge pull request #845 from bhollis/i18n 
Fix several issues around i18n and resource metadata.
 2013-04-03 11:25:18 -07:00
Pavel Argentov
6f76ae31a9 Added .idea dir to .gitignore 
… just in case if somebody uses RubyMine to dev it.
 2013-04-03 12:35:33 +04:00
Ben Hollis
4d5c509688 Fix several issues around i18n and resource metadata. 
There are a few things changing here. One is that we always dup metadata before using it - this prevents a class of nasty bugs where after the first resource list build, blocks had been deleted from metadata hashes, meaning they would no longer be applied. Now they will always stick around. Then, I made sure that whenever we render a file, we save the previous I18n.locale and restore it afterwards, in case people change locale from blocks. This should help in some weird cases where files are rendered recursively. Finally, I've added a :lang option that can be used from "page" or "proxy" to allow people to specify the language for one or more files without having to pass a block that sets I18n.locale directly, which should make that pattern much cleaner. This fixes #809 and may also fix middleman/middleman-blog#106.
 2013-04-03 00:07:31 -07:00
Ben Hollis
cc418c7a2d Ruby 2.0 switches to using #inspect instead of #to_s when printing out objects, which brings back the infinite-hang-on-NoMethodError bug from http://bugs.ruby-lang.org/issues/4521. Aliasing #inspect to #to_s for Middleman::Application fixes it again. This fixes #833. 2013-04-02 22:20:37 -07:00
Ben Hollis
7c1c93562a Merge pull request #842 from tricknotes/fix-method-comments 
Fix method comments
 2013-03-29 08:51:10 -07:00
Ryunosuke SATO
3de491981a Fix method comments 
`rake doc` shows some warnings.
I fixed method comments to suppress it.
 2013-03-29 03:15:33 +09:00
Capi Etheriel
c1c752aa32 Suggest adding middleman-livereload to bundle 2013-03-26 15:07:22 -03:00
Capi Etheriel
00ac776fc4 Document livereload usage in config file 2013-03-26 11:21:17 -03:00
Thomas Reynolds
92954a7c95 Merge pull request #839 from tricknotes/modify-year-in-smacss 
Modify copyright year in smacss template
 2013-03-25 12:44:57 -07:00
Ryunosuke SATO
afd8f0e775 Modify copyright year in smacss template 
2012 -> 2013
 2013-03-26 03:19:01 +09:00
Thomas Reynolds
8aa652713a Merge pull request #836 from tricknotes/directory-as-a-data-key 
Support directory name as a data key
 2013-03-25 09:53:58 -07:00
Thomas Reynolds
420b4c6087 simplest thing that could work implementation of Middleman::Extension 2013-03-23 15:35:38 -07:00
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
1c7308fcea Remove Rainpress pure ruby CSS compressor and simply use SCSS :) 2013-03-19 16:21:49 -07:00
Thomas Reynolds
fc30e0570b changelog 2013-03-19 16:09:58 -07:00
Thomas Reynolds
77fe264788 prep 2013-03-19 15:55:41 -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
Thomas Reynolds
c994004aaa bump tilt requirement, unregister plaintext template. fixes #824 2013-03-18 14:11:48 -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