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 |
|
|
Ben Hollis
|
fd9f726b9a
|
Remove 1.8 notice message
|
2013-11-25 22:51:34 -08:00 |
|
|
Thomas Reynolds
|
48db12429a
|
upgrade padrino. closes #1078
|
2013-11-19 18:10:39 -08:00 |
|
|
Ben Hollis
|
ac64b17ef0
|
Require Ruby 1.9.3+
|
2013-11-18 20:19:57 -08:00 |
|
|
Thomas Reynolds
|
238f992551
|
post install message
|
2013-11-02 18:01:23 -07:00 |
|
|
Thomas Reynolds
|
7762abe461
|
prep
|
2013-10-15 14:40:01 -07:00 |
|
|
Thomas Reynolds
|
912b33929f
|
bump listen
|
2013-06-19 10:23:53 -07:00 |
|
|
Thomas Reynolds
|
d71af3f5a1
|
Force padrino to skip safebuffer on erb
|
2013-06-08 15:36:14 -07:00 |
|
|
Thomas Reynolds
|
8863473756
|
bump dep
|
2013-06-02 19:04:33 -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
|
90eb5fca3e
|
loosen thor dep now that we're bundling padrino
|
2013-05-23 13:32:10 -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
|
4964022998
|
rollback some versions
|
2013-05-03 11:24:05 -07:00 |
|
|
Thomas Reynolds
|
399af44c71
|
update uglifier dep
|
2013-04-22 22:22:36 -07:00 |
|
|
Thomas Reynolds
|
8a54645de5
|
bump padrino to 0.11.x
|
2013-04-22 22:07:35 -07:00 |
|
|
Thomas Reynolds
|
c5e2ad6750
|
update listen dep
|
2013-04-22 20:50:17 -07:00 |
|
|
Thomas Reynolds
|
0e470bddd9
|
update rack dep
|
2013-04-22 20:44:07 -07:00 |
|
|
Thomas Reynolds
|
8b1bcb6246
|
move livereload dep to Gemfile
|
2013-04-22 20:30:25 -07:00 |
|
|
Thomas Reynolds
|
9fc06035b1
|
unrequire osx file watcher
|
2013-04-11 09:53:38 -07:00 |
|
|
Thomas Reynolds
|
f2f3ad21b6
|
bump tilt requirement, unregister plaintext template. fixes #824
|
2013-03-18 14:12:49 -07:00 |
|
|
Thomas Reynolds
|
0f80965ae3
|
latest listen supports new wdm
|
2013-02-24 13:34:07 -08:00 |
|
|
Thomas Reynolds
|
aa2102cbb7
|
update listen dep
|
2013-02-19 17:14:10 -08:00 |
|
|
Ben Hollis
|
1af96fe305
|
Fix gemspecs
|
2013-02-09 10:28:55 -08:00 |
|
|
Ben Hollis
|
de7e621766
|
Revert the more-flexible Thor dependency since it breaks bundle install for JRuby and we will need to update Padrino when it gets upgraded anyway
|
2013-02-08 00:05:34 -08:00 |
|
|
Thomas Reynolds
|
5f84833fc5
|
loosening our thor dependency in advance of padrino updating to 0.16. Closes #751
|
2013-01-25 23:04:52 -08:00 |
|
|
Ben Hollis
|
6dbe7f7a5a
|
Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs.
|
2013-01-25 22:31:40 -08:00 |
|
|
Thomas Reynolds
|
aa633a1cd3
|
make windows rack generic again
|
2013-01-09 10:28:47 -08:00 |
|
|
Thomas Reynolds
|
84239f04a2
|
lock rack version
|
2013-01-08 10:23:13 -08:00 |
|
|
Thomas Reynolds
|
d3818e8368
|
Prep 3.0.5
|
2012-09-23 19:00:40 -07:00 |
|
|
Thomas Reynolds
|
9b9146b437
|
The return of the windows gem, for wdm and speedier file watching support
|
2012-09-01 08:44:02 -07:00 |
|
|
Thomas Reynolds
|
1c9a97990e
|
Update some gem requirements, lock Padrino
|
2012-07-02 16:35:53 -07:00 |
|
|
Thomas Reynolds
|
f907f4acb4
|
Merge branch 'master' of github.com:middleman/middleman
|
2012-06-20 17:53:27 -07:00 |
|
|
Thomas Reynolds
|
8912d3627d
|
Update Padrino to 0.10.7 and Thor to 0.15.3. Closes #495
|
2012-06-20 17:53:14 -07:00 |
|
|
Thomas Reynolds
|
fbc4591922
|
bump listen dep
|
2012-06-20 09:51:19 -07:00 |
|
|
Thomas Reynolds
|
ab717af590
|
bump deps
|
2012-06-13 23:19:28 -07:00 |
|
|
Thomas Reynolds
|
939a3287d5
|
bump listen dep
|
2012-06-08 17:19:31 -07:00 |
|
|
Thomas Reynolds
|
092a82157d
|
bump bundler dep, try to track down JRuby 1.9 encoding weirdness
|
2012-06-05 16:48:58 -07:00 |
|
|
Thomas Reynolds
|
286c7352b6
|
Fix Less load paths, simplify builder error output. Fixes #461
|
2012-06-05 10:24:00 -07:00 |
|
|
Thomas Reynolds
|
f9b7188986
|
Bump activesupport
|
2012-05-31 19:11:12 -07:00 |
|
|
Thomas Reynolds
|
64f84bacd2
|
asset urls, padrino helpers and i18n belong in more
|
2012-05-24 16:31:21 -07:00 |
|