Thomas Reynolds
48ce4a8beb
Update vendor.yml
2013-06-04 15:23:01 -06:00
Thomas Reynolds
69c36e691f
use latest padrino
2013-06-04 09:56:33 -07:00
Thomas Reynolds
39d3fa01ad
Merge branch 'master' of github.com:middleman/middleman
2013-06-04 09:48:45 -07:00
Thomas Reynolds
a9839731e6
only require padrino once
2013-06-04 09:48:01 -07:00
Thomas Reynolds
d3d85f8bc7
Merge pull request #923 from pulletsforever/feature/rack-block
...
Allow block to be passed through from Middleman.server()
2013-06-03 13:35:01 -07:00
David W. Keith
f2f17c33b3
Allow block to be passed through from Middleman.server()
2013-06-03 11:48:16 -07:00
Thomas Reynolds
c741735446
update path to helpers for sitemap metapages
2013-06-03 10:07:09 -07:00
Thomas Reynolds
564af31987
Merge pull request #922 from middleman/ignore-vendor-folder
...
include '/vendor' in ignored files / folders
2013-06-03 09:57:13 -07:00
Karl Freeman
32b113dc93
include '/vendor' in ignored files / folders
2013-06-03 17:06:43 +01:00
Thomas Reynolds
8863473756
bump dep
2013-06-02 19:04:33 -07:00
Thomas Reynolds
d0cd3e3cf9
layouts_dir is now configurable. Closes #899
2013-06-01 15:25:44 -07:00
Thomas Reynolds
149f6ffa5b
fix builder not cleaning empty directories
2013-05-31 21:20:15 -04:00
Thomas Reynolds
9d50cad910
Merge branch 'master' of github.com:middleman/middleman
2013-05-31 21:01:34 -04:00
Thomas Reynolds
10f1d7ada2
break apart some methods to make code less complex
2013-05-31 20:46:12 -04:00
Thomas Reynolds
8cf25c7cc3
Merge pull request #920 from bhollis/empty
...
Add an "empty" template and let template classes override the "Gemfile" template.
2013-05-31 06:49:57 -07:00
Ben Hollis
85c6a8faa3
Fix changelog
2013-05-30 21:21:13 -07:00
Ben Hollis
dbcb28dded
Add an "empty" template and let template classes override the "Gemfile" template.
...
Custom template classes can define "self.gemfile_template" to return the path to their own Gemfile template, without having to reimplement our generate_bundler! task.
2013-05-30 21:17:43 -07:00
Ben Hollis
7127401aa2
Micro-optimize some regexes
2013-05-30 21:17:42 -07:00
Thomas Reynolds
fe2a7c4dd6
Merge branch 'master' of github.com:middleman/middleman
2013-05-31 00:11:54 -04:00
Ben Hollis
7bdf28a421
Fix ignoring layouts from the sitemap when the source directory has been set to something other than 'source'. Fixes #896 .
2013-05-30 20:17:58 -07:00
Ben Hollis
474b56ae25
Merge pull request #917 from joallard/i18n_pages
...
Fix #823-2 to allow only one extension on localized views
2013-05-30 18:39:13 -07:00
Thomas Reynolds
f4002dbb36
update changelog
2013-05-30 15:13:42 -04:00
Thomas Reynolds
403d6abd05
fix up simplecov, add coveralls
2013-05-30 13:38:52 -04:00
Jonathan Allard
56f16c2488
Fix #823-2 to allow only one extension on localized views
...
Make Sitemap::Store#strip_away_locale actually do something
2013-05-30 13:37:31 -04:00
Thomas Reynolds
31f238f881
Refactor some of i18n for better codeclimate scores. In the process, make nested i18n files work like rails
2013-05-29 14:00:37 -04:00
Thomas Reynolds
86cd626084
write some file change and deletion tests for better data coverage
2013-05-29 10:59:03 -04:00
Thomas Reynolds
b8b48afcbb
how do i paren?
2013-05-29 10:35:00 -04:00
Thomas Reynolds
fef8b8417d
Add more nested data tests, actually get simplecov to run
2013-05-29 09:59:15 -04:00
Thomas Reynolds
3d247d40fb
Merge pull request #914 from krautcomputing/replace_data_page_with_current_page_data
...
Replace all occurrences of data.page with current_page.data
2013-05-29 06:04:09 -07:00
Manuel Meurer
ed59260367
Replace all occurrences of data.page with current_page.data
...
see https://github.com/middleman/middleman/issues/912
2013-05-29 11:25:57 +02:00
Ben Hollis
994bd651f8
Add Simplecov
2013-05-28 22:29:58 -07:00
Ben Hollis
f611a7185b
Clean up frontmatter a bit
2013-05-28 22:29:58 -07:00
Thomas Reynolds
38b3d5155d
Merge pull request #904 from bhollis/master
...
Cache the filtered resource list
2013-05-26 20:21:18 -07:00
Ben Hollis
e03ef4226a
Cache the filtered resource list to avoid calling Resource#ignored? a ton
2013-05-26 16:38:28 -07:00
Thomas Reynolds
950aace674
Make Frontmatter a class-based extension to simplify file
2013-05-24 17:11:46 -07:00
Thomas Reynolds
5104579623
after_build support in class-based extension
2013-05-24 15:49:15 -07:00
Thomas Reynolds
7611f4ef4a
Listen bundles these gems again (le sigh)
2013-05-24 11:34:03 -07:00
Thomas Reynolds
3d804494f5
ignore tmp dir
2013-05-24 10:34:10 -07:00
Thomas Reynolds
117a9ab6f9
unneeded require
2013-05-23 16:27:37 -07:00
Thomas Reynolds
5b8c7a2494
move vendored gems into shared root
2013-05-23 16:06:20 -07:00
Thomas Reynolds
7a227b8bac
stub out blank middleman-more gem for backwards compat with extensions
2013-05-23 15:26:33 -07:00
Thomas Reynolds
77157b96e0
jruby isn't optional
2013-05-23 15:04:05 -07:00
Thomas Reynolds
ed9012ef5b
Ruby 1.8 can't regex on a symbol (or something)
2013-05-23 14:55:26 -07:00
Thomas Reynolds
bcdaad6443
Merge pull request #906 from adamesque/master
...
Make sure Frontmatter data is actually cached
2013-05-23 13:35:01 -07:00
Thomas Reynolds
90eb5fca3e
loosen thor dep now that we're bundling padrino
2013-05-23 13:32:10 -07:00
Thomas Reynolds
424fee0722
Cache frontmatter repeated calling of recursively_enhance
2013-05-23 13:31:52 -07:00
Adam Luikart
c60cddc1ac
Make sure Frontmatter data is actually cached. Fixes #903
...
(Can't return a value to early out of a begin…end expression in Ruby)
2013-05-23 14:50:46 -05:00
Ben Hollis
dbbf84016f
Fix c9d151ba66 for when files are outside the project
2013-05-22 23:39:56 -07:00
Thomas Reynolds
c9d151ba66
The file watcher knows which files exist, so don't use slow File.exists?
...
Possible solution for #903
2013-05-22 17:38:01 -07:00
Thomas Reynolds
fc37ef9b99
vendor padrino
2013-05-19 13:53:37 -07:00
