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
|
e5d95944c4
|
use instance hooks provided by hooks instead of changing the gem’s source
Conflicts:
middleman-core/lib/middleman-core/core_extensions/extensions.rb
|
2014-02-03 23:37:55 +01:00 |
|
|
Nico Hagenburger
|
732532b72e
|
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0
Conflicts:
middleman-core/lib/middleman-core/application.rb
|
2014-02-03 23:34:31 +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 |
|
|
Nico Hagenburger
|
2ad91339bb
|
use instance hooks provided by hooks instead of changing the gem’s source
|
2014-02-02 11:12:57 +01:00 |
|
|
Nico Hagenburger
|
247a152d39
|
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0
|
2014-02-01 23:45:46 +01:00 |
|
|
Thomas Reynolds
|
bea2515a41
|
Move CLI into middleman-cli
|
2014-01-02 16:39:06 -08:00 |
|
|
Thomas Reynolds
|
6b6e9b143d
|
actually add new padrino
|
2013-11-22 08:47:07 -08:00 |
|
|
Thomas Reynolds
|
48db12429a
|
upgrade padrino. closes #1078
|
2013-11-19 18:10:39 -08:00 |
|
|
Thomas Reynolds
|
69c36e691f
|
use latest padrino
|
2013-06-04 09:56:33 -07:00 |
|
|
Thomas Reynolds
|
5b8c7a2494
|
move vendored gems into shared root
|
2013-05-23 16:06:20 -07:00 |
|