Commit graph

2456 commits

Author SHA1 Message Date
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
cb87e70a72 Merge pull request #1163 from jagthedrummer/jeremy/console-fix
Update the console to the new logger syntax.
2014-01-31 09:19:49 -08:00
Jeremy Green
b056f4f1d1 Update the console to the new logger syntax. 2014-01-30 23:26:17 -06:00
Thomas Reynolds
f0fcebe169 disable sass cache since it cant marshal the path to the MM instance 2014-01-28 10:46:39 -08:00
Thomas Reynolds
c2d85c35f2 prep release 2014-01-27 09:56:48 -08:00
Thomas Reynolds
277721ee1c Merge pull request #1160 from minivan/template-link-fix
Fix dynamic pages link in the config template
2014-01-27 09:49:10 -08:00
Thomas Reynolds
4bc9079470 Merge pull request #1161 from nybblr/v3-stable
Update Uglifier to 1.4.0 in middleman.gemspec
2014-01-27 09:48:43 -08:00
Ivan Zarea
3993034883 Fix dynamic pages link in the config template 2014-01-27 09:35:30 +02:00
Jonathan Martin
674c3eed0e Update middleman.gemspec
Bump Uglifier.
2014-01-24 21:24:45 -05:00
Thomas Reynolds
6ad90766a7 Merge pull request #1156 from yawboakye/alias_console_to_c
added an alias for `console` command
2014-01-22 21:57:08 -08:00
Yaw Boakye
5a974ce75a added an alias for console command
Almost every other command has an alias except `console`. Also the
comment above the class definition wrongly said `console` was a command
for creating new projects. Corrected appropriately
2014-01-22 02:02:51 +00:00
Thomas Reynolds
6219c95040 Merge pull request #1150 from yawboakye/help_on_middleman_cli_commands
give information on finding help for each command
2014-01-16 09:22:55 -08:00
yawboakye
89044396d9 give information on finding help for each command
At the end of the tasks lists, the new line added gives information on
how to find information on all the possible command that can be ran with
`middleman`. Information include options that can be passed to the
command
2014-01-16 01:19:55 +00:00
Karl Freeman
164b6bd983 Happy 2014! 2014-01-15 14:54:16 +00:00
Thomas Reynolds
27c596fd35 Merge pull request #1148 from samsymons/master
Fix a few typos in the documentation.
2014-01-09 21:08:20 -08:00
Sam Symons
df1236412b Corrected a handful of documentation typos. 2014-01-09 19:49:41 -08:00
Thomas Reynolds
1dc9b97a5e better ruby style on some changes 2014-01-04 12:44:20 -08:00
Thomas Reynolds
504a1c2eba remove confusing and broken data.page variable 2014-01-03 16:18:16 -08:00
Thomas Reynolds
98e3c8aa79 remove instance variable and page block support 2014-01-03 15:49:54 -08:00
Thomas Reynolds
614d69dc18 move current_path in to the template context, one less piece of global state 2014-01-03 14:56:16 -08:00
Thomas Reynolds
f40903e663 move rendering into specialized File and Template rendering classes. 2014-01-03 13:40:37 -08:00
Thomas Reynolds
c06fbcfc93 rely directly on rack-mock 2014-01-02 21:45:42 -08:00
Thomas Reynolds
926ba0036c Merge pull request #1142 from middleman/middleman_cli
Move CLI into middleman-cli
2014-01-02 17:24:49 -08:00
Thomas Reynolds
bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds
09c7bda6b1 Merge pull request #1138 from middleman/template_jail
Put template rendering in a jail
2014-01-02 16:33:05 -08:00
Thomas Reynolds
305d2f99ed Put template rendering in a jail 2014-01-02 16:05:39 -08:00
Thomas Reynolds
9798f152ca silence slim warnings 2014-01-02 14:59:14 -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
95eaeba960 Start cleaning up Rack internals 2014-01-01 19:09:47 -08:00
Thomas Reynolds
0a288131c1 changelog 2014-01-01 18:09:19 -08:00
Thomas Reynolds
42fb8c229a bump version 2014-01-01 18:08:30 -08:00
Thomas Reynolds
8a9fae0e35 Merge pull request #1136 from middleman/remove_v3_extensions
Remove v3 extensions
2014-01-01 18:07:56 -08:00
Thomas Reynolds
a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Thomas Reynolds
b5fec39df8 2.1 is for reals now 2014-01-01 15:00:56 -08:00
Thomas Reynolds
572bf533f8 Merge pull request #1135 from middleman/config_context
Put all config.rb access into a jail.
2014-01-01 13:27:09 -08:00
Thomas Reynolds
c95c924d53 build a config file jail 2013-12-31 18:21:30 -08:00
Thomas Reynolds
2e2415612a spring cleaning util and discovery of nasty variable mutating in url_for 2013-12-31 14:41:17 -08:00
Karl Freeman
3cc74aae7e whitespace [ci skip] 2013-12-30 21:39:28 +00: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
b0a5722b34 use latest bundler 2013-12-29 22:45:43 +00:00
Karl Freeman
1de2f5c290 TRAVIS environment variable already set
http://about.travis-ci.org/docs/user/ci-environment/#Environment-variables
2013-12-29 13:01:33 +00:00
Ben Hollis
2a89de8e2b Merge pull request #1128 from coffeencoke/fixes_call_to_newline_constant
Specify the full path to the NEWLINE constant
2013-12-28 19:09:03 -08:00
Matt Simpson
21f575af3a Specify the full path to the NEWLINE constant 2013-12-28 19:43:59 -06:00
Thomas Reynolds
bbfbcf7583 Merge pull request #1126 from middleman/travis-rejig
Fast fail and Ruby 2.1 / head testing
2013-12-28 12:49:25 -08:00
Karl Freeman
a31aa5d8be TrailingWhitespace 'cop' fix 2013-12-28 18:14:15 +00:00
Karl Freeman
bf327c17b7 include additional files to 'cop' 2013-12-28 18:13:44 +00:00