Dennis Günnewig
|
98a36d68f0
|
Merge branch 'v3-stable' into feature/chained_templates_partials
Conflicts:
middleman-core/lib/middleman-core/core_extensions/rendering.rb
|
2014-07-31 13:00:19 +02:00 |
|
|
Dennis Günnewig
|
856f05709c
|
Support template chaining for partials
|
2014-07-31 11:39:02 +02:00 |
|
|
Dennis Günnewig
|
0add2e6676
|
Added a step to create templates on the fly
|
2014-07-31 08:46:22 +02:00 |
|
Thomas Reynolds
|
b39b913cfb
|
Merge pull request #1337 from dg-vrnetze/feature/new_server_steps
Added some new steps to test middleman applications
|
2014-07-29 07:22:38 -07:00 |
|
Max Meyer
|
398a038523
|
Support check for status code
|
2014-07-29 09:04:10 +02:00 |
|
|
Max Meyer
|
6dc7eb6353
|
Support should not see block
|
2014-07-29 09:03:56 +02:00 |
|
|
Thomas Reynolds
|
2f545cefbe
|
Attempt to allow i18n to override partial lookup. #1333
|
2014-07-24 11:11:27 -07:00 |
|
|
Thomas Reynolds
|
767db6ff26
|
Frozen works strangely on nils
|
2014-07-23 22:09:46 -07:00 |
|
|
Thomas Reynolds
|
ff11be93a0
|
fix source type typo
|
2014-07-23 22:03:54 -07:00 |
|
|
Thomas Reynolds
|
bfd4e5d7fa
|
make asset hash option required
|
2014-07-23 21:09:25 -07:00 |
|
|
Thomas Reynolds
|
5e20fca73e
|
Required options for extensions
|
2014-07-23 21:08:20 -07:00 |
|
|
Thomas Reynolds
|
21c38b707c
|
Merge pull request #1321 from middleman/grunt
Add external command support
|
2014-07-22 18:39:37 -07:00 |
|
|
Thomas Reynolds
|
feef2bf71c
|
Add external command support
|
2014-07-22 18:38:57 -07:00 |
|
|
Thomas Reynolds
|
bb0b4e7992
|
Merge pull request #1322 from middleman/sources
Multiple Source watchers
|
2014-07-22 18:38:49 -07:00 |
|
|
Thomas Reynolds
|
bedf235ff6
|
Multiple Source watchers
|
2014-07-20 18:57:22 -07:00 |
|
|
Thomas Reynolds
|
525e700bfa
|
Move all templates over to Github. Remove need for auto-loaded extensions in CLI
|
2014-07-20 14:25:47 -07:00 |
|
|
Thomas Reynolds
|
9087da05d5
|
Merge branch 'v3-stable'
|
2014-07-20 13:54:45 -07:00 |
|
|
Thomas Reynolds
|
15d6210df8
|
Use the resource instead of the request path for auto asset helpers. Fixes #1326
|
2014-07-20 13:53:05 -07:00 |
|
|
Thomas Reynolds
|
debf3c704b
|
Remove template lookup cache in build mode. Fixes #1301
|
2014-07-20 13:37:16 -07:00 |
|
Ben Hollis
|
22dace72df
|
Upgrade url_for to search for resources relative to their destination paths as well as their source paths. This would fix #818.
|
2014-07-19 16:40:53 -07:00 |
|
|
Thomas Reynolds
|
8f4057736a
|
merge update deps
|
2014-07-18 14:31:07 -07:00 |
|
|
Thomas Reynolds
|
2426abe6f5
|
bump deps
|
2014-07-18 14:16:50 -07:00 |
|
|
Thomas Reynolds
|
6678ea1ae3
|
merge static partial change
|
2014-07-18 12:54:27 -07:00 |
|
|
Thomas Reynolds
|
f0603ddf2f
|
work with static partials. Closes #1206
|
2014-07-18 10:54:48 -07:00 |
|
|
Thomas Reynolds
|
b6951f2729
|
use stable sprockets branch
|
2014-07-17 09:32:38 -07:00 |
|
|
Thomas Reynolds
|
1f3e2043cb
|
Deep freeze IndifferentAccess.
|
2014-07-14 13:19:34 -07:00 |
|
|
Thomas Reynolds
|
332ce2bebc
|
slight util reorg
|
2014-07-14 09:50:44 -07:00 |
|
|
Thomas Reynolds
|
c74d03777a
|
Add edge references to compass and sprockets back to gemfile
|
2014-07-14 08:56:29 -07:00 |
|
|
Thomas Reynolds
|
1f69967652
|
Merge pull request #1319 from middleman/builder_api
Separate Build from Thor
|
2014-07-11 09:33:39 -07:00 |
|
|
Thomas Reynolds
|
3ae16111ef
|
Separate Build from Thor
|
2014-07-11 09:22:53 -07:00 |
|
|
Thomas Reynolds
|
886fe40922
|
Merge pull request #1228 from middleman/file_watcher_refactor
FileWatcher Refactor
|
2014-07-11 09:19:45 -07:00 |
|
|
Thomas Reynolds
|
840c927ac0
|
Fix some bugs in the Slim renderer when converting to Extensions
|
2014-07-10 13:30:16 -07:00 |
|
|
Thomas Reynolds
|
215ddad660
|
actually, just depend on it
|
2014-07-10 13:11:14 -07:00 |
|
|
Thomas Reynolds
|
7e068cc77d
|
move contracts from gemfile to gemspec
|
2014-07-10 13:07:27 -07:00 |
|
|
Thomas Reynolds
|
9ae8a3128b
|
Refactor FileWatcher
|
2014-07-10 12:38:38 -07:00 |
|
|
Thomas Reynolds
|
6ccab8e071
|
Name things :)
|
2014-07-10 12:35:47 -07:00 |
|
|
Thomas Reynolds
|
08b75f06ef
|
more generic duck-typed rack extractor
|
2014-07-09 10:59:00 -07:00 |
|
|
Thomas Reynolds
|
fafeea0857
|
Handle Rack responses from Sprockets
|
2014-07-09 10:46:03 -07:00 |
|
|
Thomas Reynolds
|
0dc5843b57
|
autorequire less
|
2014-07-09 10:09:41 -07:00 |
|
|
Thomas Reynolds
|
c9d0dc7fb0
|
remove autoload sprockets, it'll use our new auto_activation code
|
2014-07-09 09:50:51 -07:00 |
|
Eliott Appleford
|
bf03c14518
|
merge spec fixes onto master
|
2014-07-09 14:10:49 +01:00 |
|
|
Thomas Reynolds
|
f2e5918e79
|
Merge pull request #1311 from middleman/contracts
Experiment with Contracts
|
2014-07-08 20:41:40 -07:00 |
|
|
Thomas Reynolds
|
0185d37473
|
Experiment with Contracts
|
2014-07-08 18:18:17 -07:00 |
|
|
Thomas Reynolds
|
928eb82d65
|
Convert Sitemap::Extensions into actual Middleman::Extension
|
2014-07-08 17:02:02 -07:00 |
|
|
Thomas Reynolds
|
52dcf37f24
|
Merge pull request #1318 from bhollis/partials_dir
Remove partials_dir functionality
|
2014-07-08 09:19:36 -07:00 |
|
|
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 |
|