Commit graph

2263 commits

Author SHA1 Message Date
Ben Hollis
310eae255e Nice styling for sitemap pages 2013-04-13 18:13:51 -07:00
Ben Hollis
b4f131d615 Styling for config meta page 2013-04-13 18:13:51 -07:00
Ben Hollis
a2f0cc263a Merge pull request #861 from bhollis/extensions
A bunch of extensions and config meta pages work
2013-04-13 16:38:17 -07:00
Ben Hollis
daf1756300 Merge pull request #862 from middleman/default_clean_true
Default build to --clean
2013-04-13 16:37:51 -07:00
Thomas Reynolds
2679b7c506 Default build to cleaning 2013-04-13 13:52:22 -07:00
Ben Hollis
6fcbac0368 Advertise meta pages on startup 2013-04-12 23:32:18 -07:00
Ben Hollis
774361bf89 Add extensions to meta config page 2013-04-12 23:32:18 -07:00
Ben Hollis
2d4668f524 Add in the metadata rack app early so it is there whenever middleware grabs the app 2013-04-12 23:32:18 -07:00
Ben Hollis
ee11ccb184 Reorganize Request a bit 2013-04-12 23:32:18 -07:00
Ben Hollis
8001dab258 Save information about extensions in a discoverable way.
This allows us to display extension config information at /__middleman/config/, and also allows users to modify extension
settings after they're activated in config.rb with a statement like "extensions[:asset_hash].options.exts += ['.js']".
2013-04-12 23:32:18 -07:00
Ben Hollis
b9b17e3ac5 In general, no need for bundle exec since we call bundle/setup 2013-04-12 23:32:17 -07:00
Ben Hollis
6bf4059f4a Rewrite asset hash extension with new extension class 2013-04-12 23:32:17 -07:00
Ben Hollis
b4c2bf3098 Requiring sinatra messes stuff up 2013-04-12 23:32:17 -07:00
Ben Hollis
f7cd0e231e Update the extension template for the new Extension class. 2013-04-12 23:32:17 -07:00
Ben Hollis
13f8426da4 Fix location of meta pages in CHANGELOG 2013-04-12 23:32:17 -07:00
Ben Hollis
b607d70a52 Simplify configuration a bit, and make extensions raise an error if the user tries to set an invalid extension option. 2013-04-12 23:32:17 -07:00
Ben Hollis
81d9ed118b Add Sprockets changes to CHANGELOG 2013-04-12 23:32:16 -07:00
Thomas Reynolds
3f94df1eef prep 3.1 beta 2013-04-12 16:19:47 -07:00
Thomas Reynolds
0574cc3d28 Support sideloading from .frontmatter files. Closes #855 2013-04-12 16:14:16 -07:00
Thomas Reynolds
a0445e405a Allow frontmatter renderer_options key to overwrite renderer options on a per-file basis. closes #859 2013-04-11 10:13:36 -07:00
Thomas Reynolds
9fc06035b1 unrequire osx file watcher 2013-04-11 09:53:38 -07:00
Ben Hollis
f0449229a9 Unregister .csv from Tilt as well. Fixes #822. 2013-04-09 23:15:05 -07:00
Ben Hollis
283576af1a Refactor some trivial extensions back into application. 2013-04-09 23:06:10 -07:00
Ben Hollis
fdd52cd640 Remove global access to the rack env and response 2013-04-09 23:06:10 -07:00
Ben Hollis
16ca3d5c17 Make some common shared state, and logging, threadsafe 2013-04-09 23:06:10 -07:00
Ben Hollis
fb9a322b6e Fold assets.rb into default_helpers.rb 2013-04-09 23:06:10 -07:00
Artem Baguinski
fe6a18fbe6 Merge pull request #854 from artm/partials_dir
A setting for custom partials dir
2013-04-08 23:47:58 -07:00
Artem Baguinski
cf1f6a0957 test nested partials_dir 2013-04-09 08:46:18 +02:00
Artem Baguinski
fe20d92b28 feature for partials_dir setting 2013-04-09 08:46:18 +02:00
Artem Baguinski
91e7033d54 a first stab at partials_dir setting
re #252
2013-04-09 08:46:18 +02:00
Ben Hollis
023ea9f34e Process resources for asset_hash extension in a specific order. This makes sure static assets (images, fonts) get their paths modified before assets that include them (css, js). 2013-04-08 00:50:58 -07:00
Ben Hollis
1617875934 Activate Sprockets before user config 2013-04-07 23:33:40 -07:00
Ben Hollis
b159946a6e Upgrade fivemat 2013-04-06 23:53:51 -07:00
Ben Hollis
de1bfc440c Support fonts with asset_path 2013-04-06 23:39:45 -07:00
Ben Hollis
c602df30dd Fix some 1.8.7 issues 2013-04-06 22:55:49 -07:00
Ben Hollis
d6fa92d70e Add i18n changes to CHANGELOG 2013-04-06 18:30:10 -07:00
Ben Hollis
3e75a10056 Switch default markdown engine to Kramdown 2013-04-06 18:26:41 -07:00
Thomas Reynolds
53bddf8304 Merge pull request #853 from bhollis/i18n
Include I18n::Fallbacks and set the default I18n locale to our default locale.
2013-04-06 18:25:23 -07:00
Ben Hollis
17b3e3e628 Include I18n::Fallbacks and set the default I18n locale to our default locale.
Thus, when a translation is missing in the current locale, fall back to the default locale. See https://github.com/svenfuchs/i18n/wiki/Fallbacks for more info and configuration settings available to users.

Also, this change adds a "t" helper that proxies to I18n.t, just like Rails, for more concise translating.
2013-04-06 18:07:09 -07:00
Ben Hollis
ee10d207a1 Update changelog with changes on master since 3.0.13 2013-04-06 16:58:47 -07:00
Ben Hollis
37ef6a31da Merge remote-tracking branch 'origin/3.0-stable' 2013-04-06 16:09:41 -07:00
Ben Hollis
7a4aa109a6 Overhaul content-type handling, making it configurable via page/proxy commands as well as frontmatter with the 'content_type' parameter.
Now, users can set content type explicitly for their files in a number of ways, or rely on automatic file-extension content types. Proxied files default to automatic file-extension content types, but then fall back to the content type of the resource they proxy to. There is also a bug fixed around correctly setting content type inside send_file. Fixes #821.
2013-04-06 15:11:25 -07:00
Ben Hollis
397ccd2c1e Fix a bunch of Ruby warnings, including a bug in the not_found method 2013-04-06 14:56:08 -07:00
Ben Hollis
1d869b0c08 Simplify frontmatter by removing its resource_list_manipulator 2013-04-06 14:56:08 -07:00
Ben Hollis
14a39e5e87 Minor performance fix to not double-compute metadata in directory_indexes. 2013-04-06 14:56:04 -07:00
Ben Hollis
044b49d83b Fixes for alpha Sass versions 2013-04-04 23:28:28 -07:00
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