middleman

deac/middleman

Fork 0

Commit graph

226099d64e Bump listen for test Thomas Reynolds 2015-08-17 10:55:34 -07:00
50bf848ee8 Add config CLI command Thomas Reynolds 2015-08-17 10:48:56 -07:00
bb6b8c7f13 Replace Hamster hash for user-accessible data with Hashie Indifferent access Thomas Reynolds 2015-08-12 15:24:35 -07:00
23cf612dd9 bump sprockets branch v3.4.0 Thomas Reynolds 2015-08-12 10:51:06 -07:00
fb6bca234f Update to newer cucumber and aruba Thomas Reynolds 2015-08-10 16:58:32 -07:00
ee5e8ff4a1 Merge pull request #1581 from jsdalton/bug/incorrect-file-watch-config Thomas Reynolds 2015-08-10 16:58:17 -07:00
1a3f96b58f Fix misnamed config value which was causing --force-polling flag to be ignored by file_watcher extension Jim Dalton 2015-08-10 15:04:47 -07:00
8cce9b8a8c Loudly announce external pipeline errors and exit with failure. Thomas Reynolds 2015-08-10 10:00:23 -07:00
dcbeb7dc76 Remove fivemat Thomas Reynolds 2015-08-06 11:06:34 -07:00
b0c90e1192 Merge pull request #1580 from maxmeyer/feature/bump_cucumber Thomas Reynolds 2015-08-06 10:35:27 -07:00
dc4057d8dc Bump version of cucumber Max Meyer 2015-08-05 22:51:25 +02:00
0fba2ae2f6 Fix config meta page Thomas Reynolds 2015-08-05 13:37:03 -07:00
fa3a95fa23 Fixes problem with after_render hooks returning nil. Ash Furrow 2015-08-01 18:09:14 -04:00
837a679aa7 bump thor Thomas Reynolds 2015-07-24 14:51:20 -07:00
a528659034 Bump listen to 3.0 Thomas Reynolds 2015-07-24 14:20:04 -07:00
7bfacd565a Update change log Thomas Reynolds 2015-07-22 11:24:57 -07:00
63e9cd9b5f Substitue whitespace in name Dennis Günnewig 2015-07-21 10:28:11 +02:00
c69099c451 Really fix #1568 Thomas Reynolds 2015-07-22 14:32:14 -07:00
0a8ceb24b0 Add test for #1568 Thomas Reynolds 2015-07-20 12:13:10 -07:00
1d69bcd4bc Merge pull request #1567 from mauro-oto/fix_rubocop_warnings Thomas Reynolds 2015-07-20 09:09:02 -07:00
dcc52d967c Applied Rubocop feedback. Mauro Otonelli 2015-07-19 20:45:45 -03:00
c11a9e6f39 Removed invalid Rubocop blocks. Mauro Otonelli 2015-07-19 20:45:10 -03:00
4364d754a5 Merge pull request #1564 from mauro-oto/remove_dir_related_deprec_warnings Eliott Appleford 2015-07-17 01:07:17 +01:00
d2f8dc9932 Merge pull request #1528 from maxmeyer/feature/listener Thomas Reynolds 2015-07-16 15:12:09 -07:00
df13c62a6b Revert "Attempt to help #1563" Thomas Reynolds 2015-07-16 11:34:46 -07:00
68a6eacc33 Removed most deprecation warnings from the build. Mauro Otonelli 2015-07-15 22:03:41 -03:00
55f909d9cf Attempt to help #1563 Thomas Reynolds 2015-07-15 14:08:51 -07:00
a855b634e6 Merge pull request #1560 from mauro-oto/remove_active_support_json Eliott Appleford 2015-07-15 12:03:06 +01:00
d18e5ed973 Locked aruba to ~> 0.7.4, as 0.8 (latest) breaks the build. Mauro Otonelli 2015-07-14 21:32:52 -03:00
63d6a00ed9 Use native Ruby JSON implementation instead of ActiveSupport's. Mauro Otonelli 2015-07-14 19:30:17 -03:00
c14fd72d04 Remove unused integer/inflections extension. Mauro Otonelli 2015-07-14 19:26:59 -03:00
2b449bc398 Remove showtitle attribute from asciidoc renderer Artem Vorotnikov 2015-07-05 09:19:10 +03:00
6aa7ce741a Refactor preview server to support server_name and bind_address Max Meyer 2015-06-25 15:39:56 +02:00
232aca91bc Make testing a little bit easier and require features-directory to make subdirectories in cucumber work Max Meyer 2015-06-25 22:26:46 +02:00
724e249b49 Experiment with activersupport bump Thomas Reynolds 2015-06-23 15:53:12 -07:00
9abcdaa7f7 Experiment with activersupport bump Thomas Reynolds 2015-06-23 15:49:36 -07:00
8bbda9ea7b Whoops again Thomas Reynolds 2015-06-22 11:28:09 -07:00
709a0d1a6c Fix previous commit Thomas Reynolds 2015-06-22 10:48:40 -07:00
3fca2c6961 Add relative argument to stylesheet and javascript helpers. Closes #1539 Thomas Reynolds 2015-06-22 10:37:17 -07:00
1efe6a27c5 Add tests for Slim inline filters. Refactor similar feature in Haml filters. Closes #1542 Thomas Reynolds 2015-06-16 16:47:42 -07:00
7383f67874 Implement yaml data postscript Thomas Reynolds 2015-06-16 15:30:37 -07:00
e09f7fadb5 Add better error messaging for #1541 Thomas Reynolds 2015-06-15 09:58:29 -07:00
3cbe2acaf7 Merge pull request #1540 from middleman/extended-globs Eliott Appleford 2015-06-14 13:26:30 +01:00
70d4671d2c Allow extended globs with ignore Eliott Appleford 2015-06-14 11:55:10 +01:00
c0ddf15add Merge pull request #1538 from taf2/patch-1 Thomas Reynolds 2015-06-11 14:50:48 -07:00
ae2d1487fa Update util.rb Todd Fisher 2015-06-11 15:24:19 -04:00
6562716aa5 bone head move Thomas Reynolds 2015-06-09 10:42:41 -07:00
3e46e8139f Add osx build env Thomas Reynolds 2015-06-09 10:17:47 -07:00
bb44e59e6e Blindly attempt to imrpove encoding situation Thomas Reynolds 2015-06-09 10:15:24 -07:00
915b059e4a Merge pull request #1535 from maxmeyer/feature/capybara Thomas Reynolds 2015-06-09 09:39:01 -07:00
3935a7cf5f Use capybara to make javascript testing possible Max Meyer 2015-06-08 04:12:00 +02:00
b2cb90c20f Allow live collections based on generic data. Helps with #1527 Thomas Reynolds 2015-06-02 16:16:07 -07:00
a38a20322f update changelog Thomas Reynolds 2015-06-02 13:58:56 -07:00
5630395b40 allow bad paths in i18n links. for #850 Thomas Reynolds 2015-06-02 13:48:23 -07:00
ca8655744a Support relative urls in i18n links. For #850 Thomas Reynolds 2015-06-01 13:49:14 -07:00
5e30ef98a1 Fix new link_to i18n w.r.t. index pages. For #850 Thomas Reynolds 2015-06-01 11:51:27 -07:00
68adbfeb2a Add to localized content. For #850 Thomas Reynolds 2015-06-01 11:32:11 -07:00
81a77828bd Make rack request object available in template rendering. Closes #1532 Thomas Reynolds 2015-06-01 11:12:34 -07:00
7eedf6b28f Merge pull request #1533 from akarzim/fix/asset_hash Thomas Reynolds 2015-05-28 09:56:48 -07:00
d7d37e4ae0 fix #1496 : Asset hashes on WOFF vs WOFF2 fonts get confused François Vantomme 2015-05-28 16:21:50 +02:00
3b88496803 Merge pull request #1531 from middleman/backport-407a17b Eliott Appleford 2015-05-28 09:38:13 +01:00
f5fe46cb59 Merge pull request #1517 from splebel/i18n-localized-path Thomas Reynolds 2015-05-27 12:51:39 -07:00
43211d1bc6 Fix port suggestion from unused ports Shin'ya Ueoka 2015-05-25 10:49:21 +09:00
d842023903 Merge pull request #1529 from rmm5t/rel-canonical Thomas Reynolds 2015-05-26 08:05:56 -07:00
bca04841fe Merge pull request #1530 from iBenza/fix_port_suggestion Thomas Reynolds 2015-05-26 08:05:31 -07:00
407a17bc77 Fix port suggestion from unused ports Shin'ya Ueoka 2015-05-25 10:49:21 +09:00
2875dbec2a Add rel=canonical URL to default RedirectResource template Ryan McGeary 2015-05-24 14:36:44 -06:00
f2f82a4ff9 Merge pull request #1526 from zamith/patch-1 Eliott Appleford 2015-05-19 16:43:35 +01:00
af2e90cb0a Allow minify to correctly throw warnings Luís Ferreira 2015-05-19 15:41:07 +01:00
a25e9c6382 Normalize file path string encoding on darwin. For #1506 Thomas Reynolds 2015-05-17 12:25:17 -07:00
f7ba4ada20 More i18n tests and make sure templates with locale in file name take precedence over the default. Thomas Reynolds 2015-05-16 13:44:00 -07:00
d3c7436647 Tweak locale links Thomas Reynolds 2015-05-16 13:21:12 -07:00
6502b37934 Use locale for link_to flag Thomas Reynolds 2015-05-16 12:50:39 -07:00
ed5236ef37 Fix bone-headed link_to change Thomas Reynolds 2015-05-15 16:20:40 -07:00
b20d855f2c prep v3.3.13 Thomas Reynolds 2015-05-15 11:49:22 -07:00
651b5fc1c3 Merge old patch to address #1430 Thomas Reynolds 2015-05-11 09:24:22 -07:00
9de1f16f3b Empower link_to in a i18n context Thomas Reynolds 2015-05-11 09:13:04 -07:00
72916dec13 Merge pull request #1522 from paulozoom/patch-1 Thomas Reynolds 2015-05-09 14:13:34 -07:00
f2f8a42f00 Fix syntax bug on retina file matching Paulo 2015-05-09 11:15:16 +02:00
647ec149ca Add retina files support on automatic_image_sizes Paulo 2015-05-08 23:18:11 +02:00
28498b2fbe Minor cleanup of 1a23ab3938 Ben Hollis 2015-05-08 08:36:43 -07:00
6afda2a34c Merge pull request #1516 from dg-ratiodata/feature/set_hostname Ben Hollis 2015-05-08 08:27:42 -07:00
74c2413c20 Merge pull request #1521 from bhollis/ssl Thomas Reynolds 2015-05-08 07:55:55 -07:00
fd88e50db6 Output environment in verbose mode Dennis Günnewig 2015-05-08 10:12:57 +02:00
1a23ab3938 Iterate over 4 ports before giving up and let the user choose a port to listen on Dennis Günnewig 2015-05-07 09:21:47 +02:00
9741c68d34 Explicit set the hostname Dennis Günnewig 2015-05-07 09:21:11 +02:00
38e5fde04e Create our own self-signed certs, rather than letting Webrick do it for us. Ben Hollis 2015-05-07 22:09:09 -07:00
70dd18e8f1 Attempt fix for #1506 Thomas Reynolds 2015-05-07 09:01:04 -07:00
211f1b5a85 Merge pull request #1518 from yterajima/issue/builded-text-file-permission-is-0600 Thomas Reynolds 2015-05-07 08:47:19 -07:00
013b4a8394 fixed: Builded text file(html, css, xml, txt...)'s permission is 0600 yterajima 2015-05-07 21:19:30 +09:00
051f102aa0 Merge pull request #1515 from yterajima/issue/after_render-hook-is-not-work Thomas Reynolds 2015-05-06 08:08:29 -07:00
588f42f1df Merge pull request #1512 from middleman/hostname Eliott Appleford 2015-05-06 14:36:26 +01:00
c444b3f232 fixed 'after_render' hook is not work. yterajima 2015-05-06 16:16:30 +09:00
27684e2ef3 Encode hostnames to fix #1510 Eliott Appleford 2015-05-05 23:56:08 +01:00
486d34a2c1 prep beta.2 v4.0.0.beta.2 Thomas Reynolds 2015-05-04 11:05:00 -07:00
4626193f97 Fix show_exceptions Thomas Reynolds 2015-05-04 10:50:35 -07:00
9d3c30ee53 Fix subscriber contract failure Thomas Reynolds 2015-05-04 10:45:03 -07:00
cee53d0f2d Fix bad merge from v3-stable Thomas Reynolds 2015-05-04 10:02:32 -07:00
ee0f9f00f5 Tweak callback delegation Thomas Reynolds 2015-05-04 09:58:29 -07:00
de5234818d Prep v3.3.12 Thomas Reynolds 2015-05-04 09:40:33 -07:00