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
Thomas Reynolds
b19e8bc185
reorg some of the more stuff
2013-05-19 13:26:16 -07:00
Thomas Reynolds
4d0ffe11c0
Merge branch 'master' of github.com:middleman/middleman
2013-05-18 13:47:29 -07:00
Thomas Reynolds
407f1b67a3
fix test for updated uglifier
2013-05-18 13:47:15 -07:00
Thomas Reynolds
633e14f266
Merge pull request #897 from middleman/readme-license-contributing
...
Readme / License / Contributing
2013-05-18 13:25:13 -07:00
Karl Freeman
f20101ac32
add CONTRIBUTING.md / LICENSE.md, rejig README.md / .gemspec
2013-05-17 13:34:15 +01:00
Thomas Reynolds
15cfbd3b51
bump
2013-05-16 17:03:32 -07:00
Thomas Reynolds
de5dfe3a91
High-level 3.1 changes
2013-05-15 17:45:25 -07:00
Thomas Reynolds
4502913f53
update some deps
2013-05-15 17:40:22 -07:00
Thomas Reynolds
2f4f741c3c
Merge pull request #893 from bhollis/master
...
Some small improvements
2013-05-13 10:36:52 -07:00
Ben Hollis
0b017bbf3d
Require padrino helpers from sitemap meta page
2013-05-12 13:55:24 -07:00
Ben Hollis
2d17fd7480
Show a warning when default helpers or Compass are not installed.
2013-05-12 10:35:40 -07:00
Ben Hollis
ee05fa3d2c
Add total to the end of gzip output
2013-05-12 10:09:53 -07:00
Thomas Reynolds
37e22c040e
Merge pull request #891 from middleman/magic_more
...
Merge more into core, use gem availability to autoload support
2013-05-09 22:46:15 -07:00
Thomas Reynolds
9ebddeed1d
merge more into core, use gem availability to autoload
2013-05-09 14:41:26 -07:00
Thomas Reynolds
27a9fa98f7
Merge pull request #886 from pwnall/font_paths
...
More font paths test coverage.
2013-05-06 09:33:20 -07:00
Victor Costan
c0e1bf06bf
More font paths test coverage.
...
Specifically, the new cases check the correctness of paths generated by
font_files / font_url when relative_assets is on in build mode, and when
a custom fonts_dir is specified in preview mode.
2013-05-05 21:39:50 -04:00
Thomas Reynolds
c474e2b410
Merge pull request #885 from bhollis/master
...
Clear up build errors & always run after_build
2013-05-04 12:00:52 -07:00
Ben Hollis
b4d75351a2
Make errors more obvious during build (with color) and run after_build hooks even if there's an error.
2013-05-04 10:57:17 -07:00
Ben Hollis
64878bfc23
Replace all_files_under with method that doesn't modify in-place
2013-05-04 10:56:38 -07:00
Thomas Reynolds
2ef3b7e4d9
fix listen deprecation
2013-05-03 11:40:30 -07:00
Thomas Reynolds
b230018692
quick release to work around i18n gem dep problem
2013-05-03 11:24:53 -07:00
Thomas Reynolds
4964022998
rollback some versions
2013-05-03 11:24:05 -07:00
Thomas Reynolds
fdc5154462
scope it, real good
2013-05-02 23:01:30 -07:00
Thomas Reynolds
a0363210d6
Merge pull request #882 from bhollis/filewatch
...
Make the list of regexes ignored by FileWatcher configurable
2013-05-02 22:50:22 -07:00
Ben Hollis
1d88a52170
Make the list of regexes ignored by FileWatcher configurable
2013-05-02 22:09:54 -07:00
Ben Hollis
5970333ca2
Fixups for localizable files
2013-05-02 22:03:28 -07:00
Ben Hollis
d58acae939
Progress towards making localizable pages work
2013-05-02 21:17:50 -07:00
Jonathan Allard
1345ae6e90
I18n: Add support for localized files ( fixes #816 )
2013-05-02 19:58:23 -07:00
Jonathan Allard
23b6efbb06
Store#extensionless_path: Change implementation to make overrides easier
2013-05-02 19:14:59 -07:00
Jonathan Allard
0211114ecb
Change different-engine-layout from .str to Haml
2013-05-02 19:14:59 -07:00
Ben Hollis
ec1b92d427
Add DataStore-as-Hash stuff to CHANGELOG
2013-05-02 19:05:50 -07:00
Ben Hollis
1362a1fc81
Update default config.rb to be a bit more modern
2013-05-02 18:59:39 -07:00
Ben Hollis
3080857316
Merge pull request #840 from barraponto/livereload_instructions
...
Document livereload usage in config file
2013-05-02 18:55:48 -07:00
Ben Hollis
02d476f440
Merge pull request #880 from willkoehler/add_hash_features_to_datastore
...
Add [] operator and has_key? to DataStore to make DataStore act like a hash
2013-05-02 18:52:37 -07:00
Will Koehler
25d7544103
Add [] operator and has_key? to DataStore to make DataStore act like a hash.
...
The main benefit of this is to add the ability to gracefully handle the case when data is not present.
2013-05-02 16:39:28 -04:00
Thomas Reynolds
eedfc5ab45
update gem builder helper
2013-05-01 10:16:46 -07:00
