Ben Hollis
|
4745418200
|
Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
.travis.yml
Gemfile
middleman-core/lib/middleman-core/version.rb
middleman-core/middleman-core-x86-mingw32.gemspec
middleman-core/middleman-core.gemspec
|
2013-03-02 22:32:03 -08:00 |
|
|
Ben Hollis
|
9057b7a85e
|
Support Haml 4. Tests only run with Haml 4 now. Fixes #783
|
2013-02-17 19:40:17 -08:00 |
|
|
Ben Hollis
|
c0c14f4eab
|
Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/cli/build.rb
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/preview_server.rb
middleman-core/lib/middleman-core/renderers/sass.rb
middleman-core/lib/middleman-core/sitemap/store.rb
middleman-core/lib/middleman-core/util.rb
middleman-core/lib/middleman-core/version.rb
middleman-more/lib/middleman-more/core_extensions/compass.rb
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
middleman-more/lib/middleman-more/extensions/asset_hash.rb
|
2013-01-25 21:43:30 -08:00 |
|
Thomas Reynolds
|
80fb3ff06f
|
merge
|
2013-01-13 15:25:35 -08:00 |
|
|
Thomas Reynolds
|
c7e35b95ba
|
use .sass-cache everywhere
|
2013-01-13 15:22:36 -08:00 |
|
Alex Peattie
|
816bca9643
|
Fix for embedded Markdown in Slim w/ Redcarpet
|
2012-12-15 14:52:15 -08:00 |
|
|
Alex Peattie
|
ecefe2a04e
|
Fix for embedded Markdown in Slim w/ Redcarpet
|
2012-11-07 11:30:24 -08:00 |
|
|
Thomas Reynolds
|
0eb906efac
|
Stylus support and tests. Fixes #649
|
2012-10-28 12:19:47 -07:00 |
|
|
Thomas Reynolds
|
01e9c336b0
|
Stylus support and tests. Fixes #649
|
2012-10-28 12:18:29 -07:00 |
|
|
Ben Hollis
|
4fe22e3fb5
|
Move more things over to new configs. Don't let root be configured
|
2012-10-13 22:37:24 -07:00 |
|
|
Ben Hollis
|
a50ca56fbc
|
Switch over to new config methods
|
2012-10-13 21:37:02 -07:00 |
|
|
Thomas Reynolds
|
54c055ea5e
|
Hack a way to pass Middleman context into Slim filters
|
2012-08-16 13:48:34 -07:00 |
|
|
Thomas Reynolds
|
446aa6a4ba
|
Clean up whitespace, play with cane for testing style quality and code complexity
|
2012-08-13 15:41:07 -07:00 |
|
|
Thomas Reynolds
|
955c66a54f
|
Setup Less paths for imports
|
2012-08-10 12:29:15 -07:00 |
|
|
Thomas Reynolds
|
6ccf5e2db0
|
Don't catch CoffeeScript errors when in build mode. Fixes #551
|
2012-07-25 11:22:29 -07:00 |
|
|
Thomas Reynolds
|
de6d7980ac
|
Use centralized Logger and add instrument methods
|
2012-07-18 09:30:39 -07:00 |
|
|
Thomas Reynolds
|
6f0f9b00a2
|
Merge pull request #536 from kematzy/fix-sass-cache-location
Fix sass cache location
|
2012-07-16 22:14:05 -07:00 |
|
kematzy
|
5368875d05
|
Moved :sass_cache_path from global to Sass renderer
|
2012-07-17 09:35:40 +08:00 |
|
|
Thomas Reynolds
|
9dad67bf9b
|
Update master
|
2012-07-15 12:14:29 -07:00 |
|
|
Thomas Reynolds
|
a8f45b1e17
|
Merge pull request #532 from rumpuslabs/markdown-not-nil
Markdown engine should not be nil
|
2012-07-15 12:13:46 -07:00 |
|
Tim Bates
|
aa35b8f0f0
|
Markdown engine should not be nil
|
2012-07-15 23:02:04 +09:30 |
|
|
Ben Hollis
|
7be0590acf
|
Use middleman's image_tag and link_to helpers from within Redcarpet markdown
|
2012-07-09 00:26:33 -07:00 |
|
|
Thomas Reynolds
|
9f7f3370aa
|
Catch JRuby/Coffee exception correctly
|
2012-07-07 17:29:31 -07:00 |
|
|
Thomas Reynolds
|
63224639d9
|
Add tests for more implied extensions
|
2012-07-04 16:45:27 -07:00 |
|
|
Thomas Reynolds
|
286c7352b6
|
Fix Less load paths, simplify builder error output. Fixes #461
|
2012-06-05 10:24:00 -07:00 |
|
|
Thomas Reynolds
|
2535ce2c90
|
fix // search and replace typo
|
2012-05-28 22:01:36 -07:00 |
|
|
Thomas Reynolds
|
67e78f20c7
|
Move renderers into core, but don't require gems and only register templates if gems present
|
2012-05-28 13:19:40 -07:00 |
|
|
Thomas Reynolds
|
2130e902c2
|
Begin splitting our requires into correct places instead of autoload
Disable autoload on watcher
finish moving requires out
|
2012-04-14 13:59:45 -07:00 |
|
|
Thomas Reynolds
|
e769477e93
|
Implied extensions. Closes #304
|
2012-03-29 18:22:43 +01:00 |
|
|
Thomas Reynolds
|
c7249a63b1
|
middleman-more is fully rdoc'd
|
2011-12-31 14:28:17 -08:00 |
|
|
Thomas Reynolds
|
c8a134a386
|
split into middleman-core and middleman-more
|
2011-12-29 15:09:51 -08:00 |
|