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

110 commits

Author SHA1 Message Date
Thomas Reynolds
578ff18fa0 Bump some deps 2015-11-30 16:58:17 -08:00
Thomas Reynolds
6de88a832e Make Ruby Sass the default, but use SassC if available. Addresses #1648 2015-11-27 15:41:42 -08:00
Thomas Reynolds
dd0ee24ca3 Work around Listen :only weirdness. Addresses #1637 2015-11-27 15:26:46 -08:00
Thomas Reynolds
d2251de898 Bump Padrino 2015-10-12 12:37:33 -07:00
Thomas Reynolds
eb82f402a0 gem bumps 2015-10-05 09:48:17 -07:00
Thomas Reynolds
fd6a2376bd Fix frontmatter on 2.0 2015-10-01 10:25:53 -07:00
Thomas Reynolds
04c133c90f Fix minify css tests 2015-09-28 13:58:49 -07:00
Thomas Reynolds
32891dc6fe SassC, woot 2015-09-28 11:24:37 -07:00
Thomas Reynolds
d3d32731e1 more test fixes 2015-09-19 16:00:38 -07:00
Thomas Reynolds
fdabd87957 merge in fixes from stable 2015-09-17 13:53:43 -07:00
Thomas Reynolds
226099d64e Bump listen for test 2015-08-17 10:55:34 -07:00
Thomas Reynolds
bb6b8c7f13 Replace Hamster hash for user-accessible data with Hashie Indifferent access 2015-08-12 15:29:06 -07:00
Thomas Reynolds
a528659034 Bump listen to 3.0 2015-07-24 14:20:04 -07:00
Thomas Reynolds
724e249b49 Experiment with activersupport bump 2015-06-23 15:53:12 -07:00
Thomas Reynolds
9abcdaa7f7 Experiment with activersupport bump 2015-06-23 15:49:36 -07:00
Max Meyer
3935a7cf5f Use capybara to make javascript testing possible 2015-06-09 06:57:15 +02:00
Thomas Reynolds
e64954fbff Finish porting to new callbacks manager 2015-05-03 15:38:23 -07:00
Thomas Reynolds
22ce56492f Experiment with Hamster 2015-04-24 10:28:03 -07:00
Thomas Reynolds
55c5a46440 Update contracts gem. #1494 2015-04-24 10:26:42 -07:00
Thomas Reynolds
c94e5d0f4d Merge from stable 2015-02-24 11:16:16 -08:00
Thomas Reynolds
e4b7d4fff0 begin prepping beta.1 2015-02-07 13:38:29 -08:00
Thomas Reynolds
302a891bbb Update some deps 2015-01-03 14:32:21 -06:00
Max Meyer
488a4b74ab Update version of i18n 2014-12-28 10:36:33 +01:00
Thomas Reynolds
a95dbb6367 Collections 2014-10-15 14:34:53 -05:00
Thomas Reynolds
445443cffc Add a bit of laziness 2014-10-15 14:25:06 -05:00
Thomas Reynolds
0f785a448a updated from stable 2014-08-14 10:14:26 -07:00
Thomas Reynolds
2b928a326c Handle breaking padrino change. Closes #1349 2014-08-13 20:24:20 -07:00
Thomas Reynolds
215ddad660 actually, just depend on it 2014-07-10 13:11:14 -07:00
Thomas Reynolds
7e068cc77d move contracts from gemfile to gemspec 2014-07-10 13:07:27 -07:00
Thomas Reynolds
a2f67a4f37 listen gem conflict 2014-07-02 09:30:58 -07:00
Eliott Appleford
6678decd29 Update listen gem 2014-07-02 12:57:01 +01: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
00bbdfa254 unvendor fastimage 2014-05-26 18:00:39 -07:00
Thomas Reynolds
07aa2113b9 merge activesupport update 2014-04-09 16:14:10 -07:00
Thomas Reynolds
dc3d4f9fd5 bump activesupport 2014-04-09 16:12:57 -07:00
Thomas Reynolds
4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds
f3edabfb7e bump execjs dep 2014-04-04 10:48:08 -07:00
Thomas Reynolds
638e2e64b7 Unvendor padrino 2014-04-04 10:22:34 -07:00
Thomas Reynolds
fac4928d50 Update haml and sass deps 
Conflicts:
	Gemfile
	middleman/middleman.gemspec
 2014-04-03 10:01:18 -07:00
Karl Freeman
ce83e502f6 more consistency across all gems 
- rubocop'd for cosmetics
 2014-03-25 08:50:28 +00:00
Thomas Reynolds
ae1edd482f upgrade to newest activesupport 2014-03-20 09:53:01 -07: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
Nico Hagenburger
0c3000c799 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem 2014-02-03 23:39:23 +01:00
Nico Hagenburger
d6f9e8c640 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem 2014-02-02 11:18:25 +01:00
Thomas Reynolds
c06fbcfc93 rely directly on rack-mock 2014-01-02 21:45:42 -08: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
Thomas Reynolds
d77ef04774 upgrade to newest activesupport 2014-01-02 14:38:18 -08:00
Thomas Reynolds
e996868033 Depend on new i18n gem, silence deprecation warning 2013-12-25 16:52:29 -08:00