Commit graph

69 commits

Author SHA1 Message Date
Thomas Reynolds 2b2ee10d81 dont autoload stuff when bundler will load 2015-09-16 14:01:39 -07:00
Thomas Reynolds 260c6be66c Move compass and sprockets to template config 2015-09-16 10:53:31 -07:00
Thomas Reynolds d99b922e67 Let's do this 2015-09-12 16:16:26 -07:00
Thomas Reynolds 5591c3337b released deps 2015-05-02 13:56:37 -07:00
Thomas Reynolds f61e08a9c3 Allow more permissive compass versions 2015-03-30 17:05:36 -07:00
Thomas Reynolds ee4c68b03c prep alpha, backwards compat 2014-12-23 14:54:21 -08:00
Thomas Reynolds 07ac578a31 merge 2014-08-24 11:36:42 -07:00
Thomas Reynolds a1979f11b1 Update sass dep and test new error message 2014-08-20 09:48:03 -07:00
Thomas Reynolds d4010c9dc4 prep for realz 2014-08-18 14:00:28 -07:00
Thomas Reynolds 51d57afc73 require new compass, fix tests 2014-08-17 13:20:29 -07:00
Thomas Reynolds e9661a88c5 prep alpha 2014-08-15 10:09:08 -07:00
Maik Kempe 309ebe6121 [➠] Bumped “compass-import-once” dependency to version 1.0.5. 2014-08-13 11:30:45 +02: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 29bf25ace6 Extract compass support into extension, rewrite all features that rely on it to be pure Ruby 2014-06-03 09:01:46 -07:00
Thomas Reynolds ba01a0a72b more templates back into cli 2014-05-26 18:44:11 -07:00
Ben Hollis 5f9dec3dc8 Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman/middleman.gemspec
2014-05-15 23:41:04 -07:00
Thomas Reynolds 2dd87bab74 Fix combo of compass-import-once and sass-globs. Closes middleman/middleman-sprockets#56 2014-05-01 10:01:45 -07:00
Thomas Reynolds 4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds 7ae4c4d14e use compass-import-once 2014-04-04 17:02:22 -07:00
Thomas Reynolds 3cb320abdf Add Karl to authors list 2014-04-04 10:50:35 -07:00
Thomas Reynolds f3edabfb7e bump execjs dep 2014-04-04 10:48:08 -07:00
Thomas Reynolds 80256ec3c5 revert back to sass 3.2 and stable compass 2014-04-04 10:38:50 -07:00
Thomas Reynolds bf62454dc2 bump uglifier dep 2014-04-04 10:31:11 -07:00
Thomas Reynolds fac4928d50 Update haml and sass deps
Conflicts:
	Gemfile
	middleman/middleman.gemspec
2014-04-03 10:01:18 -07:00
Thomas Reynolds f800a51fb2 Update haml and sass deps 2014-04-03 09:53:33 -07:00
Karl Freeman 6c84ed4674 whitespace [ci skip] 2014-03-25 13:13:36 +00:00
Karl Freeman f4bcfc885a lose the empty files, keep the directory 2014-03-25 13:09:38 +00:00
Karl Freeman 174c04d5c8 consistency with other gems [ci skip] 2014-03-25 10:09:51 +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 772de85ce3 move to middleman-templates 2014-03-11 11:07:55 +00:00
Jonathan Martin 674c3eed0e Update middleman.gemspec
Bump Uglifier.
2014-01-24 21:24:45 -05:00
Thomas Reynolds bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds 5afa66f194 bump deps 1 2014-01-02 14:48:40 -08:00
Karl Freeman 03d6e6c990 Implemented Rubocop
- just took a stab at running the StringLiterals cop to get a taste.
2013-12-28 00:47:39 +00:00
Ben Hollis ac64b17ef0 Require Ruby 1.9.3+ 2013-11-18 20:19:57 -08:00
Ben Hollis 2bff77b70d No longer depend on middleman-more 2013-10-19 15:35:25 -07:00
Thomas Reynolds cd60a92d14 force latest kramdown 2013-10-02 11:34:55 -07:00
Ben Hollis e6d5c8e91b Loosen kramdown dependency 2013-09-16 22:02:55 -07:00
Bill Tozier 44f8f556a4 kramdown 1.0.x -> 1.1 2013-07-19 18:42:47 -04:00
Thomas Reynolds d71af3f5a1 Force padrino to skip safebuffer on erb 2013-06-08 15:36:14 -07:00
Thomas Reynolds 7a227b8bac stub out blank middleman-more gem for backwards compat with extensions 2013-05-23 15:26:33 -07:00
Thomas Reynolds fc37ef9b99 vendor padrino 2013-05-19 13:53:37 -07:00
Karl Freeman f20101ac32 add CONTRIBUTING.md / LICENSE.md, rejig README.md / .gemspec 2013-05-17 13:34:15 +01:00
Thomas Reynolds 4502913f53 update some deps 2013-05-15 17:40:22 -07:00
Thomas Reynolds 9ebddeed1d merge more into core, use gem availability to autoload 2013-05-09 14:41:26 -07:00
Thomas Reynolds 8b1bcb6246 move livereload dep to Gemfile 2013-04-22 20:30:25 -07:00
Thomas Reynolds 3d2ddf973e bundle livereload 2013-04-21 20:49:15 -07:00
Thomas Reynolds c2e2839b79 allow new sprockets 2013-04-14 16:21:36 -07:00