Thomas Reynolds
|
fac4928d50
|
Update haml and sass deps
Conflicts:
Gemfile
middleman/middleman.gemspec
|
2014-04-03 10:01:18 -07:00 |
|
Thomas Reynolds
|
6d2f8cd50c
|
Add options hash to asset methods to allow special options to be passed through from extensions
|
2014-03-31 14:15:46 -07:00 |
|
Thomas Reynolds
|
1c37cc6a34
|
Merge pull request #1238 from bhollis/asciidoc
Remove Asciidoc support in favor of a middleman-asciidoc extension
|
2014-03-30 10:52:40 -07:00 |
|
Thomas Reynolds
|
f99e333f30
|
Merge pull request #1237 from bhollis/ext
Clean up extensions a bit
|
2014-03-30 10:52:30 -07:00 |
|
Ben Hollis
|
5ce8549f03
|
Remove Asciidoc support in favor of a middleman-asciidoc extension.
|
2014-03-29 19:24:51 -07:00 |
|
Ben Hollis
|
c1f7299cfd
|
Fix some references to extensions[:frontmatter]
|
2014-03-29 17:21:49 -07:00 |
|
Ben Hollis
|
abeee38126
|
Remove yet another way to register extensions and register/activate FrontMatter like a normal extension.
|
2014-03-29 17:17:00 -07:00 |
|
Ben Hollis
|
a6c37f3dd3
|
Clean up extensions a bit. Removes newest form of registering extensions, more consistently sets and uses an extension's ext_name, and makes a lot of things errors instead of just log messages in hopes that people can't get too far with a messed-up config.
|
2014-03-29 14:29:42 -07:00 |
|
Ben Hollis
|
10eca91311
|
Fix docs for HashWithIndifferentAccess
|
2014-03-25 22:43:43 -07:00 |
|
Ben Hollis
|
60f712e6ba
|
Merge branch 'v3-stable'
Conflicts:
.travis.yml
Gemfile
middleman-cli/lib/middleman-cli/build.rb
middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
middleman-core/lib/middleman-core/templates.rb
middleman-core/lib/middleman-core/util.rb
middleman-core/middleman-core.gemspec
|
2014-03-25 22:35:19 -07:00 |
|
Thomas Reynolds
|
91675c4588
|
move sprockets init
|
2014-03-25 17:00:17 -07:00 |
|
Thomas Reynolds
|
8bc2fddb9d
|
Remove static serving of non-Middleman folders
|
2014-03-25 16:57:57 -07:00 |
|
Thomas Reynolds
|
1b6af9a4c1
|
Expose asset_path on the main Application object (Sprockets needed it)
|
2014-03-25 11:01:35 -07:00 |
|
Thomas Reynolds
|
37a8caf3fa
|
Bring back extension block register syntax. Closes #1192
|
2014-03-25 11:00:43 -07:00 |
|
Karl Freeman
|
d3e9108f12
|
already ignored [ci skip]
|
2014-03-25 13:19:31 +00:00 |
|
Karl Freeman
|
6c84ed4674
|
whitespace [ci skip]
|
2014-03-25 13:13:36 +00:00 |
|
Karl Freeman
|
04d9ecbb5a
|
ignore tempts from Rubocop
|
2014-03-25 13:09:54 +00:00 |
|
Karl Freeman
|
f4bcfc885a
|
lose the empty files, keep the directory
|
2014-03-25 13:09:38 +00:00 |
|
Karl Freeman
|
5a38827b01
|
middleman-templates has no executable [ci skip]
|
2014-03-25 12:06:31 +00:00 |
|
Karl Freeman
|
174c04d5c8
|
consistency with other gems [ci skip]
|
2014-03-25 10:09:51 +00:00 |
|
Karl Freeman
|
57534b6e7c
|
rubocop'd Gemfile
- add rubocop as a development dependency
|
2014-03-25 10:08:59 +00:00 |
|
Karl Freeman
|
283583629e
|
svg badges [ci skip]
|
2014-03-25 09:53:21 +00:00 |
|
Karl Freeman
|
1de871a57b
|
not needed
|
2014-03-25 09:07:27 +00:00 |
|
Karl Freeman
|
ce83e502f6
|
more consistency across all gems
- rubocop'd for cosmetics
|
2014-03-25 08:50:28 +00:00 |
|
Karl Freeman
|
c5609dc889
|
up to date
|
2014-03-25 08:46:03 +00:00 |
|
Karl Freeman
|
c1ef5fc2bf
|
refresh travis
- indicate that we're keen on caching
- test against a larger variety of ruby interpreters however, lets allow some failures
- not allow 2.1 to fail?
|
2014-03-25 08:35:33 +00:00 |
|
Karl Freeman
|
845d529a50
|
don't load local templates if no HOME is set
|
2014-03-25 08:21:53 +00:00 |
|
Karl Freeman
|
ad14766278
|
Although equivalent, clearer for non-*nix based systems
|
2014-03-24 10:39:25 +00:00 |
|
Ben Hollis
|
bb5b4054ff
|
Don't bother processing asset hash on ignored resources. On a large project with a lot of Sprockets dependencies that were mostly ignored, this brought the build down from 30 minutes to 1 minute
|
2014-03-23 23:35:12 -07:00 |
|
Ben Hollis
|
0a6c80d223
|
Don't attempt to load local templates if HOME is not set
|
2014-03-23 16:49:22 -07:00 |
|
Thomas Reynolds
|
ce7636ad18
|
remove Implied Extensions feature. Closes #1211
|
2014-03-20 17:12:41 -07:00 |
|
Thomas Reynolds
|
1721dff4c7
|
add node_modules to filewatcher ignore
|
2014-03-20 10:03:44 -07:00 |
|
Thomas Reynolds
|
fde93ffed4
|
add node_modules to filewatcher ignore
|
2014-03-20 10:02:18 -07:00 |
|
Thomas Reynolds
|
ae1edd482f
|
upgrade to newest activesupport
|
2014-03-20 09:53:01 -07:00 |
|
Thomas Reynolds
|
515c91e826
|
Merge pull request #1219 from bhollis/windows
Add tzinfo-data for Windows users
|
2014-03-19 15:40:33 -07:00 |
|
Thomas Reynolds
|
4efefedb6f
|
Merge pull request #1218 from bhollis/ignore
Prevent the file watcher from recursively enumerating into paths that it should ignore
|
2014-03-19 15:40:27 -07:00 |
|
Ben Hollis
|
f71a0951ef
|
Add tzinfo-data for Windows users
|
2014-03-18 22:42:31 -07:00 |
|
Ben Hollis
|
67689e60d2
|
Prevent the file watcher from recursively enumerating into paths that it should ignore. This should fix the issue in #1197 as well as provide a performance boost when starting 'middleman server'.
|
2014-03-18 21:17:50 -07:00 |
|
Ben Hollis
|
6b7e995548
|
Merge pull request #1209 from arthurnn/travis_ci
Travis ci update
|
2014-03-18 20:02:51 -07:00 |
|
Arthur Neves
|
8eb544a3e7
|
Travis ci update
Test on 2.1.1
Dont allow failures on 2.1.x
|
2014-03-17 00:18:48 -04:00 |
|
Ben Hollis
|
04d94d9b60
|
Merge pull request #1201 from middleman/templates-rejig
Templates rejig
|
2014-03-15 19:59:46 -07:00 |
|
Karl Freeman
|
8e8ddbc301
|
rejig templates, deprecate 'empty' template and rubocop them
|
2014-03-15 13:32:11 +00:00 |
|
Ben Hollis
|
fc3658bc9d
|
Merge pull request #1199 from middleman/cross-platform-localhost
Friendlier localhost print
|
2014-03-14 15:25:32 -07:00 |
|
Thomas Reynolds
|
485cf1aed0
|
Merge pull request #1205 from bhollis/lazy-v3
Avoid loading middleman-core unless needed (v3)
|
2014-03-14 09:30:16 -07:00 |
|
Thomas Reynolds
|
5616838007
|
Merge pull request #1204 from bhollis/lazy
Avoid loading middleman-core unless needed.
|
2014-03-14 09:30:13 -07:00 |
|
Karl Freeman
|
87acf687d5
|
friendlier localhost print
|
2014-03-14 06:46:10 +00:00 |
|
Ben Hollis
|
a88f12a262
|
Apply fix from 32716f3729 - avoid loading middleman-core unless needed. Fixes #1203
|
2014-03-13 20:32:25 -07:00 |
|
Ben Hollis
|
58616ce486
|
pry-debugger is not available on Ruby 2.1
|
2014-03-13 20:31:41 -07:00 |
|
Ben Hollis
|
32716f3729
|
Avoid loading middleman-core unless needed. Fixes #1203.
|
2014-03-13 20:27:41 -07:00 |
|
Karl Freeman
|
24f7143973
|
shouldn't be here
|
2014-03-13 11:18:20 +00:00 |
|