Commit graph

56 commits

Author SHA1 Message Date
Thomas Reynolds fdabd87957 merge in fixes from stable 2015-09-17 13:53:43 -07:00
Thomas Reynolds 409a892da7 Forward port some stable changes 2015-09-17 09:41:17 -07:00
Thomas Reynolds 9ed0796b4a Move some extension setup to ready event 2015-08-20 17:45:18 -07:00
Thomas Reynolds 50bf848ee8 Add config CLI command 2015-08-17 10:48:56 -07:00
Thomas Reynolds fb6bca234f Update to newer cucumber and aruba 2015-08-10 16:58:36 -07:00
Thomas Reynolds b127283040 Fix up inline url confusion 2015-04-26 13:01:19 -07:00
Thomas Reynolds 2403fa2d81 Merge stable 2015-04-26 11:32:47 -07:00
Thomas Reynolds 26c6f453f3 Add file watcher :only option 2015-02-26 17:08:40 -08:00
Alessandro Tagliapietra bf9f94989d Clone templates from ssh 'git@' urls 2015-02-13 10:08:09 +01:00
Alessandro Tagliapietra 640c87c13a Clone template from full repository urls 2015-02-12 15:40:54 +01:00
Thomas Reynolds e4b7d4fff0 begin prepping beta.1 2015-02-07 13:38:29 -08:00
Thomas Reynolds 8e743aea94 fix interactive init test 2015-01-04 15:06:14 -06:00
Thomas Reynolds f16510d034 Update CLI 2015-01-04 14:23:35 -06:00
Thomas Reynolds ef0b996004 blog compat 2014-12-24 11:38:54 -08:00
Thomas Reynolds ee4c68b03c prep alpha, backwards compat 2014-12-23 14:54:21 -08:00
Thomas Reynolds d8e8b06cb6 merge v3 2014-11-19 09:04:56 -08:00
Andrew Kvalheim ba6ca5b3b7 Fix bug with starting the console. 2014-09-10 16:12:04 -07:00
Thomas Reynolds 84acb50b02 Optimize globbed file lookups, fixes nasty performance regression 2014-08-24 17:10:25 -07:00
Thomas Reynolds e886eeaa3e add middleman.rb option 2014-08-14 20:34:31 -07:00
Thomas Reynolds bedf235ff6 Multiple Source watchers 2014-07-20 18:57:22 -07:00
Thomas Reynolds 525e700bfa Move all templates over to Github. Remove need for auto-loaded extensions in CLI 2014-07-20 14:25:47 -07:00
Thomas Reynolds 3ae16111ef Separate Build from Thor 2014-07-11 09:22:53 -07:00
Thomas Reynolds 9ae8a3128b Refactor FileWatcher 2014-07-10 12:38:38 -07:00
Eliott Appleford bf03c14518 merge spec fixes onto master 2014-07-09 14:10:49 +01:00
Thomas Reynolds 6752a86b83 Make our Rack pipeline a simple class abstracted from the App. 2014-07-05 17:38:29 -07:00
Thomas Reynolds 0ca6c37e5d Remove App include in File Watcher 2014-07-05 16:44:04 -07:00
Thomas Reynolds 571704322d Load templates from Git 2014-07-05 11:20:08 -07:00
Thomas Reynolds 52c8109ca3 rubocoping2 2014-07-02 10:39:43 -07:00
Thomas Reynolds a21dca025e Separate Environments from Modes 2014-06-11 10:28:30 -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
Thomas Reynolds c2512e9093 update more files to non-hashrocket syntax 2014-05-26 17:58:35 -07:00
Ben Hollis b79a74b35b Improve documentation for Middleman::Extension 2014-05-11 00:35:15 -07:00
Thomas Reynolds f513ab77b3 Rubocop'd 2014-04-29 11:43:05 -07:00
Thomas Reynolds 6760d855bc hashrocket killa 2014-04-29 10:50:21 -07:00
Thomas Reynolds 4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds 8bc2fddb9d Remove static serving of non-Middleman folders 2014-03-25 16:57:57 -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 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
Ben Hollis 32716f3729 Avoid loading middleman-core unless needed. Fixes #1203. 2014-03-13 20:27:41 -07:00
Karl Freeman 9de092ba5f gemfiles are required but lets still keep the convenience of bundling 2014-03-13 09:46:49 +00:00
Karl Freeman 9fb4470248 tidy up logic
- the extension template already had a gitignore
2014-03-11 11:08:41 +00:00
Karl Freeman 772de85ce3 move to middleman-templates 2014-03-11 11:07:55 +00:00
Thomas Reynolds 23b1b8464d move livereload init into dev block 2014-03-09 17:51:02 -07:00
Ben Hollis 220d1e8948 Require Bundler (a Gemfile) for all set up Middleman projects. We still do extension auto-discovery for "init". Gemfile may now be in any parent directory of 'config.rb', in case the Middleman project is in a subdirectory of a larger project. 2014-03-03 23:47:24 -08:00
Ben Hollis 9e9bed0043 pry-debugger is not available on Ruby 2.1 2014-03-03 23:07:32 -08:00
Capi Etheriel 81baf8c47c Use no layouts for xml, json and txt by default 2014-03-01 15:21:09 -03:00
Ben Hollis 7b46fd6524 Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -08:00