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
|
057c3724fe
|
bump required sprockets
|
2013-01-03 13:08:19 -08:00 |
|
Thomas Reynolds
|
2ea35b3004
|
Stub out rspec tests for public APIs: Rack and Sitemap for now
|
2012-10-27 11:47:06 -07:00 |
|
Thomas Reynolds
|
061323a09f
|
prep release
|
2012-09-23 18:43:42 -07:00 |
|
Thomas Reynolds
|
851652bb6c
|
prep 3.0.1
|
2012-09-04 09:42:52 -07:00 |
|
Thomas Reynolds
|
0e75df16aa
|
Lets try pre instead
|
2012-09-01 12:26:41 -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
|
092a82157d
|
bump bundler dep, try to track down JRuby 1.9 encoding weirdness
|
2012-06-05 16:48:58 -07:00 |
|
Thomas Reynolds
|
8d483f882c
|
Move Sprockets into an extension
|
2012-05-26 13:43:27 -07:00 |
|
Thomas Reynolds
|
10922b6e34
|
Streamline middleman wrapper gem [no-ci]
|
2012-04-26 15:28:18 -07:00 |
|
Thomas Reynolds
|
d95c0e6a3f
|
Ducks in row
|
2012-04-21 14:48:26 -07:00 |
|
Ben Hollis
|
f1051d8c59
|
Load extensions even when only using middleman-core. Also, use Bundler.require when available rather than scanning gems for extensions.
|
2012-03-13 23:00:02 -07:00 |
|
Thomas Reynolds
|
22adf3b516
|
setup rakefile for windows build
|
2012-01-05 20:34:24 -08:00 |
|
Thomas Reynolds
|
8cbd3352a0
|
enable gemtest at a per-gem level
|
2012-01-02 14:48:47 -08:00 |
|
Thomas Reynolds
|
e496d228b0
|
try to fix some guard weirdness. hide tilt warnings, closes #220
|
2011-12-31 12:48:38 -08:00 |
|
Thomas Reynolds
|
73913f0ace
|
Start getting middleman-more tests passing. About 50% done
|
2011-12-29 19:04:39 -08:00 |
|
Thomas Reynolds
|
c8a134a386
|
split into middleman-core and middleman-more
|
2011-12-29 15:09:51 -08:00 |
|