Ben Hollis
|
004ba36741
|
Remove partials_dir functionality
|
2014-07-07 23:48:49 -07:00 |
|
|
Ben Hollis
|
50c6b3f4b9
|
Merge pull request #1313 from bhollis/remove_neighbor
Remove neighbor frontmatter support & move resource methods into Resource
|
2014-07-07 22:49:23 -07:00 |
|
|
Ben Hollis
|
a1fe810a50
|
Fixup after rebase
|
2014-07-07 22:12:44 -07:00 |
|
Thomas Reynolds
|
f47a586332
|
no longer need warning
|
2014-07-07 09:51:23 -07:00 |
|
|
Thomas Reynolds
|
b02c9e5724
|
Merge pull request #1314 from middleman/rack-out
Untangle Rack from Application
|
2014-07-06 23:11:56 -07:00 |
|
|
Ben Hollis
|
bf4310697d
|
Move proxy/ignore/content_type Resource methods into the Resource class
|
2014-07-06 16:19:33 -07:00 |
|
|
Ben Hollis
|
0cbc232dac
|
Remove neighbor frontmatter support
|
2014-07-06 16:15:43 -07:00 |
|
Eliott Appleford
|
249c649760
|
Merge pull request #1312 from Arcovion/windows-specs
Fix specs on windows
|
2014-07-06 07:44:20 +01:00 |
|
Eliott Appleford
|
a47b58c58d
|
fix gemfile conflict
|
2014-07-06 05:48:21 +01:00 |
|
|
Eliott Appleford
|
21c2b737f5
|
fix gzip spec
|
2014-07-06 04:02:43 +01:00 |
|
|
Thomas Reynolds
|
a19c1cbecc
|
refer to v4 in readme
|
2014-07-05 18:46:39 -07:00 |
|
|
Thomas Reynolds
|
7e47006f4f
|
merge
|
2014-07-05 18:43:41 -07:00 |
|
|
Thomas Reynolds
|
8bf523853e
|
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
|
2014-07-05 18:42:21 -07:00 |
|
|
Thomas Reynolds
|
ffa8415aaf
|
bump aruba dep
|
2014-07-05 18:42:15 -07:00 |
|
|
Thomas Reynolds
|
605bd4ca24
|
Update README.md
|
2014-07-05 18:35:39 -07:00 |
|
|
Thomas Reynolds
|
5f515de2b6
|
Merge pull request #1315 from Arcovion/v3-stable
Update badges
|
2014-07-05 18:28:23 -07:00 |
|
|
Thomas Reynolds
|
13acee8fd5
|
Reload MM on environment and helpers_dir changes. Closes #1274. Closes #1105
|
2014-07-05 18:26:51 -07:00 |
|
|
Eliott Appleford
|
c824807119
|
Update badges
|
2014-07-06 02:13:42 +01:00 |
|
|
Thomas Reynolds
|
6752a86b83
|
Make our Rack pipeline a simple class abstracted from the App.
|
2014-07-05 17:38:29 -07:00 |
|
|
Thomas Reynolds
|
c94470d33f
|
get i18n's hands out of app too
|
2014-07-05 16:50:19 -07:00 |
|
|
Thomas Reynolds
|
0ca6c37e5d
|
Remove App include in File Watcher
|
2014-07-05 16:44:04 -07:00 |
|
|
Thomas Reynolds
|
60bbe44e0e
|
Data ext doesn't need to touch the app obj
|
2014-07-05 16:05:00 -07:00 |
|
|
Thomas Reynolds
|
300ef8d8fe
|
Convert renderers into first-class extensions
|
2014-07-05 13:41:59 -07:00 |
|
|
Thomas Reynolds
|
c0a6d8ac4c
|
Pull mixin for extension activation into a real class
|
2014-07-05 12:51:41 -07:00 |
|
|
Thomas Reynolds
|
09c31b848b
|
Merge pull request #1286 from middleman/git_template
Load templates from Git
|
2014-07-05 11:23:44 -07:00 |
|
|
Thomas Reynolds
|
571704322d
|
Load templates from Git
|
2014-07-05 11:20:08 -07:00 |
|
|
Thomas Reynolds
|
336b80cbbd
|
Switch from ActiveSupports delegate method to Ruby 1.9+ def_delegator
|
2014-07-05 11:17:41 -07:00 |
|
|
Thomas Reynolds
|
3a19cc668d
|
move Sitemap into application, it's core to the entire system
|
2014-07-05 10:42:03 -07:00 |
|
|
Eliott Appleford
|
5897c4c4a4
|
update gemfile
|
2014-07-05 04:27:51 +01:00 |
|
|
Thomas Reynolds
|
3a2cab4775
|
Whoops, leftover include
|
2014-07-04 10:41:25 -07:00 |
|
|
Thomas Reynolds
|
1bd7dab1a3
|
Make a ProxyResource which extends Resource, rather than injecting methods into Resource
|
2014-07-04 10:38:25 -07:00 |
|
|
Eliott Appleford
|
e2e3c1e3fb
|
fix specs on windows
|
2014-07-03 21:09:32 +01:00 |
|
|
Thomas Reynolds
|
6bb9673630
|
final copping
|
2014-07-02 11:05:57 -07:00 |
|
|
Thomas Reynolds
|
5a936d315d
|
Merge remote-tracking branch 'origin/v3-stable'
|
2014-07-02 10:40:04 -07:00 |
|
|
Thomas Reynolds
|
52c8109ca3
|
rubocoping2
|
2014-07-02 10:39:43 -07:00 |
|
|
Thomas Reynolds
|
ba38498909
|
Merge pull request #1310 from Arcovion/patch-1
Update listen code
|
2014-07-02 10:39:19 -07:00 |
|
|
Eliott Appleford
|
d8f84fa97b
|
Update listen code
|
2014-07-02 18:26:18 +01:00 |
|
|
Thomas Reynolds
|
7b85a44afb
|
rubocoping
|
2014-07-02 10:11:52 -07:00 |
|
|
Thomas Reynolds
|
a2f67a4f37
|
listen gem conflict
|
2014-07-02 09:30:58 -07:00 |
|
|
Thomas Reynolds
|
bbc551624e
|
Merge pull request #1309 from Arcovion/patch-1
Update listen gem
|
2014-07-02 09:24:28 -07:00 |
|
|
Eliott Appleford
|
6678decd29
|
Update listen gem
|
2014-07-02 12:57:01 +01:00 |
|
|
Ben Hollis
|
4330ff52ae
|
Merge pull request #1308 from bhollis/slim_page
Remove options to proxy or ignore through `page`
|
2014-06-30 21:11:08 -07:00 |
|
|
Ben Hollis
|
f6dd2f6e52
|
Update CHANGELOG to mention proxy and ignore are gone from page
|
2014-06-28 21:33:28 -07:00 |
|
|
Ben Hollis
|
dfecfebc69
|
Remove options to proxy or ignore through page, and use Middleman::Util#path_match for matchers to allow a wider set of matchers.
|
2014-06-28 21:01:26 -07:00 |
|
|
Ben Hollis
|
838e25085a
|
Munge build path so that path_match works against it in gzip extension
|
2014-06-28 21:00:59 -07:00 |
|
|
Ben Hollis
|
d7fd48ef7d
|
Merge branch 'v3-stable'
Conflicts:
middleman-core/lib/middleman-more/extensions/asset_hash.rb
|
2014-06-28 18:48:49 -07:00 |
|
|
Ben Hollis
|
32bdc43ccb
|
Merge pull request #1268 from AndrewKvalheim/gzip-ignore
Excluding paths from gzipping
|
2014-06-25 21:57:26 -07:00 |
|
Andrew Kvalheim
|
429e7d64bd
|
Accept list of paths to exclude from gzipping.
|
2014-06-24 14:49:51 -07:00 |
|
|
Andrew Kvalheim
|
b819d38358
|
Test gzip extensions option.
|
2014-06-24 14:49:10 -07:00 |
|
|
Andrew Kvalheim
|
13ba9dae62
|
Make option documentation consistent.
|
2014-06-24 14:47:10 -07:00 |
|