middleman

deac/middleman

Fork 0

Commit graph

a880fa464c CHANGELOG updates Thomas Reynolds 2014-08-04 15:11:30 -07:00
625391953a Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327 Thomas Reynolds 2014-08-04 15:07:55 -07:00
05aa396399 more slim tests. Targets #1327 Thomas Reynolds 2014-08-04 14:41:22 -07:00
1c977a83e2 prep v3.3.4 Thomas Reynolds 2014-08-03 08:37:46 -07:00
724eab3ac9 fix alt tags and add test. Closes #1341 Thomas Reynolds 2014-08-03 08:29:29 -07:00
fee6a8b617 Make rubocop happy Dennis Günnewig 2014-07-31 13:13:07 +02:00
98a36d68f0 Merge branch 'v3-stable' into feature/chained_templates_partials Dennis Günnewig 2014-07-31 13:00:19 +02:00
856f05709c Support template chaining for partials Dennis Günnewig 2014-07-30 14:39:24 +02:00
0add2e6676 Added a step to create templates on the fly Dennis Günnewig 2014-07-31 08:46:22 +02:00
b39b913cfb Merge pull request #1337 from dg-vrnetze/feature/new_server_steps Thomas Reynolds 2014-07-29 07:22:38 -07:00
398a038523 Support check for status code Max Meyer 2014-07-29 09:04:10 +02:00
6dc7eb6353 Support should not see block Max Meyer 2014-07-29 09:03:56 +02:00
2f545cefbe Attempt to allow i18n to override partial lookup. #1333 Thomas Reynolds 2014-07-24 11:11:27 -07:00
767db6ff26 Frozen works strangely on nils Thomas Reynolds 2014-07-23 22:09:46 -07:00
ff11be93a0 fix source type typo Thomas Reynolds 2014-07-23 22:03:54 -07:00
bfd4e5d7fa make asset hash option required Thomas Reynolds 2014-07-23 21:09:25 -07:00
5e20fca73e Required options for extensions Thomas Reynolds 2014-07-23 21:08:20 -07:00
21c38b707c Merge pull request #1321 from middleman/grunt Thomas Reynolds 2014-07-22 18:39:37 -07:00
feef2bf71c Add external command support Thomas Reynolds 2014-07-11 14:24:22 -07:00
bb0b4e7992 Merge pull request #1322 from middleman/sources Thomas Reynolds 2014-07-22 18:38:49 -07:00
bedf235ff6 Multiple Source watchers Thomas Reynolds 2014-07-15 18:01:45 -07:00
525e700bfa Move all templates over to Github. Remove need for auto-loaded extensions in CLI Thomas Reynolds 2014-07-20 14:25:47 -07:00
9087da05d5 Merge branch 'v3-stable' Thomas Reynolds 2014-07-20 13:54:45 -07:00
15d6210df8 Use the resource instead of the request path for auto asset helpers. Fixes #1326 Thomas Reynolds 2014-07-20 13:53:05 -07:00
debf3c704b Remove template lookup cache in build mode. Fixes #1301 Thomas Reynolds 2014-07-20 13:37:16 -07:00
22dace72df Upgrade url_for to search for resources relative to their destination paths as well as their source paths. This would fix #818. Ben Hollis 2013-09-22 14:36:00 -07:00
8f4057736a merge update deps Thomas Reynolds 2014-07-18 14:31:07 -07:00
2426abe6f5 bump deps Thomas Reynolds 2014-07-18 14:16:50 -07:00
6678ea1ae3 merge static partial change Thomas Reynolds 2014-07-18 12:54:27 -07:00
f0603ddf2f work with static partials. Closes #1206 Thomas Reynolds 2014-07-18 10:54:48 -07:00
b6951f2729 use stable sprockets branch Thomas Reynolds 2014-07-17 09:32:38 -07:00
1f3e2043cb Deep freeze IndifferentAccess. Thomas Reynolds 2014-07-14 13:19:34 -07:00
332ce2bebc slight util reorg Thomas Reynolds 2014-07-14 09:50:44 -07:00
c74d03777a Add edge references to compass and sprockets back to gemfile Thomas Reynolds 2014-07-14 08:56:29 -07:00
1f69967652 Merge pull request #1319 from middleman/builder_api Thomas Reynolds 2014-07-11 09:33:39 -07:00
3ae16111ef Separate Build from Thor Thomas Reynolds 2014-07-07 19:43:22 -07:00
886fe40922 Merge pull request #1228 from middleman/file_watcher_refactor Thomas Reynolds 2014-07-11 09:19:45 -07:00
840c927ac0 Fix some bugs in the Slim renderer when converting to Extensions Thomas Reynolds 2014-07-10 13:30:16 -07:00
215ddad660 actually, just depend on it Thomas Reynolds 2014-07-10 13:11:14 -07:00
7e068cc77d move contracts from gemfile to gemspec Thomas Reynolds 2014-07-10 13:07:27 -07:00
9ae8a3128b Refactor FileWatcher Thomas Reynolds 2014-03-25 16:54:16 -07:00
6ccab8e071 Name things :) Thomas Reynolds 2014-07-10 12:35:47 -07:00
08b75f06ef more generic duck-typed rack extractor Thomas Reynolds 2014-07-09 10:59:00 -07:00
fafeea0857 Handle Rack responses from Sprockets Thomas Reynolds 2014-07-09 10:46:03 -07:00
0dc5843b57 autorequire less Thomas Reynolds 2014-07-09 10:09:41 -07:00
c9d0dc7fb0 remove autoload sprockets, it'll use our new auto_activation code Thomas Reynolds 2014-07-09 09:50:51 -07:00
bf03c14518 merge spec fixes onto master Eliott Appleford 2014-07-09 14:10:49 +01:00
f2e5918e79 Merge pull request #1311 from middleman/contracts Thomas Reynolds 2014-07-08 20:41:40 -07:00
0185d37473 Experiment with Contracts Thomas Reynolds 2014-07-02 19:04:34 -07:00
928eb82d65 Convert Sitemap::Extensions into actual Middleman::Extension Thomas Reynolds 2014-07-08 17:02:02 -07:00
52dcf37f24 Merge pull request #1318 from bhollis/partials_dir Thomas Reynolds 2014-07-08 09:19:36 -07:00
004ba36741 Remove partials_dir functionality Ben Hollis 2014-07-07 23:43:09 -07:00
50c6b3f4b9 Merge pull request #1313 from bhollis/remove_neighbor Ben Hollis 2014-07-07 22:49:23 -07:00
a1fe810a50 Fixup after rebase Ben Hollis 2014-07-07 22:12:44 -07:00
f47a586332 no longer need warning Thomas Reynolds 2014-07-07 09:51:23 -07:00
b02c9e5724 Merge pull request #1314 from middleman/rack-out Thomas Reynolds 2014-07-06 23:11:56 -07:00
bf4310697d Move proxy/ignore/content_type Resource methods into the Resource class Ben Hollis 2014-07-03 20:41:44 -07:00
0cbc232dac Remove neighbor frontmatter support Ben Hollis 2014-07-03 19:44:26 -07:00
249c649760 Merge pull request #1312 from Arcovion/windows-specs Eliott Appleford 2014-07-06 07:44:20 +01:00
a47b58c58d fix gemfile conflict Eliott Appleford 2014-07-06 04:25:07 +01:00
21c2b737f5 fix gzip spec Eliott Appleford 2014-07-06 04:02:43 +01:00
a19c1cbecc refer to v4 in readme Thomas Reynolds 2014-07-05 18:46:39 -07:00
7e47006f4f merge Thomas Reynolds 2014-07-05 18:43:41 -07:00
8bf523853e Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable Thomas Reynolds 2014-07-05 18:42:21 -07:00
ffa8415aaf bump aruba dep Thomas Reynolds 2014-07-05 18:42:15 -07:00
605bd4ca24 Update README.md Thomas Reynolds 2014-07-05 18:35:39 -07:00
5f515de2b6 Merge pull request #1315 from Arcovion/v3-stable Thomas Reynolds 2014-07-05 18:28:23 -07:00
13acee8fd5 Reload MM on environment and helpers_dir changes. Closes #1274. Closes #1105 Thomas Reynolds 2014-07-05 18:26:51 -07:00
c824807119 Update badges Eliott Appleford 2014-07-06 02:15:44 +01:00
6752a86b83 Make our Rack pipeline a simple class abstracted from the App. Thomas Reynolds 2014-07-05 12:14:58 -07:00
c94470d33f get i18n's hands out of app too Thomas Reynolds 2014-07-05 16:50:19 -07:00
0ca6c37e5d Remove App include in File Watcher Thomas Reynolds 2014-07-05 16:44:04 -07:00
60bbe44e0e Data ext doesn't need to touch the app obj Thomas Reynolds 2014-07-05 16:05:00 -07:00
300ef8d8fe Convert renderers into first-class extensions Thomas Reynolds 2014-07-05 13:41:59 -07:00
c0a6d8ac4c Pull mixin for extension activation into a real class Thomas Reynolds 2014-07-05 12:51:41 -07:00
09c31b848b Merge pull request #1286 from middleman/git_template Thomas Reynolds 2014-07-05 11:23:44 -07:00
571704322d Load templates from Git Thomas Reynolds 2014-05-26 19:55:25 -07:00
336b80cbbd Switch from ActiveSupports delegate method to Ruby 1.9+ def_delegator Thomas Reynolds 2014-07-05 11:17:41 -07:00
3a19cc668d move Sitemap into application, it's core to the entire system Thomas Reynolds 2014-07-05 10:42:03 -07:00
5897c4c4a4 update gemfile Eliott Appleford 2014-07-05 02:19:51 +01:00
3a2cab4775 Whoops, leftover include Thomas Reynolds 2014-07-04 10:41:25 -07:00
1bd7dab1a3 Make a ProxyResource which extends Resource, rather than injecting methods into Resource Thomas Reynolds 2014-07-04 10:38:25 -07:00
e2e3c1e3fb fix specs on windows Eliott Appleford 2014-07-03 20:13:22 +01:00
6bb9673630 final copping Thomas Reynolds 2014-07-02 11:05:57 -07:00
5a936d315d Merge remote-tracking branch 'origin/v3-stable' Thomas Reynolds 2014-07-02 10:40:04 -07:00
52c8109ca3 rubocoping2 Thomas Reynolds 2014-07-02 10:39:43 -07:00
ba38498909 Merge pull request #1310 from Arcovion/patch-1 Thomas Reynolds 2014-07-02 10:39:19 -07:00
d8f84fa97b Update listen code Eliott Appleford 2014-07-02 18:26:18 +01:00
7b85a44afb rubocoping Thomas Reynolds 2014-07-02 10:11:52 -07:00
a2f67a4f37 listen gem conflict Thomas Reynolds 2014-07-02 09:30:58 -07:00
bbc551624e Merge pull request #1309 from Arcovion/patch-1 Thomas Reynolds 2014-07-02 09:24:28 -07:00
6678decd29 Update listen gem Eliott Appleford 2014-07-02 12:57:01 +01:00
4330ff52ae Merge pull request #1308 from bhollis/slim_page Ben Hollis 2014-06-30 21:11:08 -07:00
f6dd2f6e52 Update CHANGELOG to mention proxy and ignore are gone from page Ben Hollis 2014-06-28 21:33:28 -07:00
dfecfebc69 Remove options to proxy or ignore through page, and use Middleman::Util#path_match for matchers to allow a wider set of matchers. Ben Hollis 2014-06-16 21:44:14 -07:00
838e25085a Munge build path so that path_match works against it in gzip extension Ben Hollis 2014-06-28 21:00:59 -07:00
d7fd48ef7d Merge branch 'v3-stable' Ben Hollis 2014-06-28 18:48:49 -07:00
32bdc43ccb Merge pull request #1268 from AndrewKvalheim/gzip-ignore Ben Hollis 2014-06-25 21:57:26 -07:00
429e7d64bd Accept list of paths to exclude from gzipping. Andrew Kvalheim 2014-05-02 11:41:59 -07:00
b819d38358 Test gzip extensions option. Andrew Kvalheim 2014-05-02 10:19:18 -07:00