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

115 commits

Author SHA1 Message Date
Thomas Reynolds
d4010c9dc4 prep for realz 2014-08-18 14:00:28 -07:00
Thomas Reynolds
e9661a88c5 prep alpha 2014-08-15 10:09:08 -07:00
Thomas Reynolds
0f785a448a updated from stable 2014-08-14 10:14:26 -07:00
Thomas Reynolds
207da11372 lock asciidoctor dep 2014-08-13 11:57:29 -07:00
Thomas Reynolds
bedf235ff6 Multiple Source watchers 2014-07-20 18:57:22 -07: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
b6951f2729 use stable sprockets branch 2014-07-17 09:32:38 -07:00
Thomas Reynolds
c74d03777a Add edge references to compass and sprockets back to gemfile 2014-07-14 08:56:29 -07:00
Thomas Reynolds
7e068cc77d move contracts from gemfile to gemspec 2014-07-10 13:07:27 -07:00
Thomas Reynolds
0dc5843b57 autorequire less 2014-07-09 10:09:41 -07:00
Thomas Reynolds
c9d0dc7fb0 remove autoload sprockets, it'll use our new auto_activation code 2014-07-09 09:50:51 -07:00
Eliott Appleford
bf03c14518 merge spec fixes onto master 2014-07-09 14:10:49 +01:00
Thomas Reynolds
0185d37473 Experiment with Contracts 2014-07-08 18:18:17 -07:00
Eliott Appleford
a47b58c58d fix gemfile conflict 2014-07-06 05:48:21 +01:00
Thomas Reynolds
7e47006f4f merge 2014-07-05 18:43:41 -07:00
Thomas Reynolds
ffa8415aaf bump aruba dep 2014-07-05 18:42:15 -07:00
Eliott Appleford
5897c4c4a4 update gemfile 2014-07-05 04:27:51 +01:00
Eliott Appleford
e2e3c1e3fb fix specs on windows 2014-07-03 21:09:32 +01:00
Thomas Reynolds
434d55b1ae See if code climate hooks work 2014-06-20 14:09:51 -07:00
Thomas Reynolds
449d38bcd2 Update to rspec 3 2014-06-11 13:39:40 -07:00
Thomas Reynolds
7840ebf98a move compass ext out of the main repo 2014-06-11 09:25:59 -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
113b352474 have travis install rubocop 2014-04-29 11:59:10 -07:00
Thomas Reynolds
f513ab77b3 Rubocop'd 2014-04-29 11:43:05 -07:00
Thomas Reynolds
8eabe4d354 rubocop 2: the reckoning 2014-04-29 10:44:24 -07:00
Thomas Reynolds
04dc48f13d Great rubocop-ing 2014-04-28 16:02:18 -07:00
Thomas Reynolds
f800a51fb2 Update haml and sass deps 2014-04-03 09:53:33 -07:00
Thomas Reynolds
6d2f8cd50c Add options hash to asset methods to allow special options to be passed through from extensions 2014-03-31 14:15:46 -07:00
Ben Hollis
5ce8549f03 Remove Asciidoc support in favor of a middleman-asciidoc extension. 2014-03-29 19:24:51 -07:00
Karl Freeman
57534b6e7c rubocop'd Gemfile 
- add rubocop as a development dependency
 2014-03-25 10:08:59 +00:00
Ben Hollis
58616ce486 pry-debugger is not available on Ruby 2.1 2014-03-13 20:31:41 -07:00
Karl Freeman
772de85ce3 move to middleman-templates 2014-03-11 11:07:55 +00:00
Ben Hollis
9e9bed0043 pry-debugger is not available on Ruby 2.1 2014-03-03 23:07:32 -08: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
Thomas Reynolds
3995ad850c update padrino. 2014-02-18 18:30:29 -08:00
Thomas Reynolds
bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds
a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Karl Freeman
dcf527008e StringLiterals 'cop' fix [ci skip] 2013-12-29 23:04:30 +00:00
Karl Freeman
f6f235c1fe exclude development gems 2013-12-29 22:53:18 +00: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
Thomas Reynolds
22c977d426 Merge branch 'master' of github.com:middleman/middleman 2013-10-29 09:44:22 -07:00
Thomas Reynolds
ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds
19c155349d Merge pull request #1044 from mojavelinux/asciidoc-renderer 
resolves #1043 added a renderer for AsciiDoc files
 2013-10-29 09:37:36 -07:00
Ben Hollis
7143f53efa Remove middleman-more files 2013-10-19 15:59:12 -07:00
Dan Allen
5439139b76 added cucumber tests for #1043, AsciiDoc support 2013-10-19 14:41:52 -06:00
Thomas Reynolds
cd9964edbe prep 2013-09-07 13:12:31 -07:00
Thomas Reynolds
ba3b8c4db3 old redcarpet for ruby 1.8 2013-07-16 15:07:59 -07:00
Thomas Reynolds
7e405fc414 And by 1.8, I mean MRI 1.8 2013-06-12 17:58:59 -07:00