deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1769 commits 11 branches 271 tags 23 MiB
Commit graph

31 commits

Author SHA1 Message Date
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
Thomas Reynolds de955aa0c3 try again 2013-02-27 13:20:26 -08:00
Thomas Reynolds a24397d45b avoid broken version of i18n gem 2013-02-27 13:02:57 -08:00
Ben Hollis f791733cc6 Constrain HAML 2013-02-15 22:26:46 -08:00
Ben Hollis 6dbe7f7a5a Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs. 2013-01-25 22:31:40 -08:00
Thomas Reynolds 5cff7cd9c1 Update execjs dep, hopefully fixing therubyrhino on JRuby 2012-07-07 16:30:50 -07:00
Thomas Reynolds 1c9a97990e Update some gem requirements, lock Padrino 2012-07-02 16:35:53 -07:00
Thomas Reynolds 8912d3627d Update Padrino to 0.10.7 and Thor to 0.15.3. Closes #495 2012-06-20 17:53:14 -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 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 8d483f882c Move Sprockets into an extension 2012-05-26 13:43:27 -07:00
Thomas Reynolds 64f84bacd2 asset urls, padrino helpers and i18n belong in more 2012-05-24 16:31:21 -07:00
Thomas Reynolds 220bb5edb2 add some sprockets update tests 2012-05-24 10:24:36 -07:00
Thomas Reynolds f0b4e56b80 Require latest execjs to avoid MultiJson warnings 2012-05-10 11:31:35 -07:00
Thomas Reynolds 5d8fd93981 loosen compass deps 2012-05-07 13:32:40 -07:00
Thomas Reynolds 7fb16a4b1b Merge pull request #413 from bhollis/maruku 
Switch back to maruku
 2012-05-02 15:10:00 -07:00
Ben Hollis 1c67871d44 Fix gemspecs for filenames with unicode paths 2012-05-01 22:57:56 -07:00
Ben Hollis 49bbc9feaa Switch back to maruku 2012-05-01 22:46:38 -07:00
Thomas Reynolds d6f75afb3d Cleanup middleman-more loading, remove autoload 2012-04-26 15:37:44 -07:00
Thomas Reynolds 1f93ec9b94 Bump deps 2012-04-22 11:02:23 -07:00
Thomas Reynolds d95c0e6a3f Ducks in row 2012-04-21 14:48:26 -07:00
Thomas Reynolds f76883b53a bump compass 2012-03-14 10:54:59 -07:00
Thomas Reynolds 892d2e7800 loosen sass dep 2012-03-13 09:18:49 -07:00
Thomas Reynolds af6145f2f7 compass is out 2012-03-13 09:18:49 -07:00
Thomas Reynolds a6d099c4a0 massage some deps 2012-03-03 16:23:06 -08:00
Thomas Reynolds 06ad7a5c88 update redcarpet dep 2012-03-03 15:56:50 -08:00
Thomas Reynolds 5842bf8e5b allow extensionless files to be previewed and built. fixes #270, but requires alternative layouts be placed in a layouts/ directory now. 2012-02-12 11:45:42 -08:00
Thomas Reynolds 8286879f36 sprockets-sass was overwriting image-url and breaking relative assets. Fixes #256 2012-02-05 11:43:19 -08:00
Thomas Reynolds 251a2e0eb3 add failing tests for compass relative assets 2012-01-31 21:30:45 -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
Renamed from middleman.gemspec (Browse further)