Thomas Reynolds
f5fe46cb59
Merge pull request #1517 from splebel/i18n-localized-path
...
Added support for complete path localization
2015-05-27 12:51:39 -07:00
Shin'ya Ueoka
43211d1bc6
Fix port suggestion from unused ports
...
Conflicts:
middleman-core/lib/middleman-core/preview_server.rb
2015-05-27 03:07:51 +01:00
Thomas Reynolds
d842023903
Merge pull request #1529 from rmm5t/rel-canonical
...
Add rel=canonical URL to default RedirectResource template
2015-05-26 08:05:56 -07:00
Thomas Reynolds
bca04841fe
Merge pull request #1530 from iBenza/fix_port_suggestion
...
Fix port suggestion from unused ports
2015-05-26 08:05:31 -07:00
Shin'ya Ueoka
407a17bc77
Fix port suggestion from unused ports
2015-05-25 10:49:21 +09:00
Ryan McGeary
2875dbec2a
Add rel=canonical URL to default RedirectResource template
...
See https://support.google.com/webmasters/answer/139066
2015-05-24 14:36:44 -06:00
Eliott Appleford
f2f82a4ff9
Merge pull request #1526 from zamith/patch-1
...
Allow minify to correctly throw warnings
2015-05-19 16:43:35 +01:00
Luís Ferreira
af2e90cb0a
Allow minify to correctly throw warnings
...
The `path` variable was being used but never defined in the context of the `minify` method. Thus, instead of a warning we would get an error. Using an instance variable fixes this.
2015-05-19 15:41:07 +01:00
Thomas Reynolds
a25e9c6382
Normalize file path string encoding on darwin. For #1506
2015-05-17 12:25:17 -07:00
Thomas Reynolds
f7ba4ada20
More i18n tests and make sure templates with locale in file name take precedence over the default.
2015-05-16 13:53:09 -07:00
Thomas Reynolds
d3c7436647
Tweak locale links
2015-05-16 13:21:12 -07:00
Thomas Reynolds
6502b37934
Use locale for link_to flag
2015-05-16 12:50:39 -07:00
Thomas Reynolds
ed5236ef37
Fix bone-headed link_to change
2015-05-15 16:20:47 -07:00
Thomas Reynolds
b20d855f2c
prep
2015-05-15 11:49:22 -07:00
Thomas Reynolds
651b5fc1c3
Merge old patch to address #1430
2015-05-11 09:24:22 -07:00
Thomas Reynolds
9de1f16f3b
Empower link_to in a i18n context
2015-05-11 09:13:04 -07:00
Thomas Reynolds
72916dec13
Merge pull request #1522 from paulozoom/patch-1
...
Add retina files support on automatic_image_sizes
2015-05-09 14:13:34 -07:00
Paulo
f2f8a42f00
Fix syntax bug on retina file matching
2015-05-09 11:15:16 +02:00
Paulo
647ec149ca
Add retina files support on automatic_image_sizes
2015-05-08 23:18:11 +02:00
Ben Hollis
28498b2fbe
Minor cleanup of 1a23ab3938
2015-05-08 08:36:43 -07:00
Ben Hollis
6afda2a34c
Merge pull request #1516 from dg-ratiodata/feature/set_hostname
...
Set host name and iterate over some ports...
2015-05-08 08:27:42 -07:00
Thomas Reynolds
74c2413c20
Merge pull request #1521 from bhollis/ssl
...
Create our own self-signed certs, rather than letting Webrick do it for us
2015-05-08 07:55:55 -07:00
Dennis Günnewig
fd88e50db6
Output environment in verbose mode
2015-05-08 10:12:57 +02:00
Dennis Günnewig
1a23ab3938
Iterate over 4 ports before giving up and let the user choose a port to listen on
2015-05-08 09:26:00 +02:00
Dennis Günnewig
9741c68d34
Explicit set the hostname
2015-05-08 09:25:54 +02:00
Ben Hollis
38e5fde04e
Create our own self-signed certs, rather than letting Webrick do it for us.
...
We now use a modified copy of Webrick's create_self_signed_certificate that generates a different certificate serial number each time (based on the current time). This avoids an error in Firefox when we serve a certificate with different details but the same serial: it throws up a "sec_error_reused_issuer_and_serial" error and refuses to let you accept the certificate. Our modified version also avoids printing garbage to $stderr.
2015-05-07 22:09:09 -07:00
Thomas Reynolds
70dd18e8f1
Attempt fix for #1506
2015-05-07 09:01:04 -07:00
Thomas Reynolds
211f1b5a85
Merge pull request #1518 from yterajima/issue/builded-text-file-permission-is-0600
...
fixed: Builded text file(html, css, xml, txt...)'s permission is 0600
2015-05-07 08:47:19 -07:00
yterajima
013b4a8394
fixed: Builded text file(html, css, xml, txt...)'s permission is 0600
...
In v3-stable branch, builded text file's permission are 0644.
But in master(v4) branch, file's permission are 0600.
When I deploy(drug-and-drop with sftp), the website isn't displayed. So
I fixed this problem.
2015-05-07 21:43:53 +09:00
Thomas Reynolds
051f102aa0
Merge pull request #1515 from yterajima/issue/after_render-hook-is-not-work
...
fixed 'after_render' hook is not work.
2015-05-06 08:08:29 -07:00
Eliott Appleford
588f42f1df
Merge pull request #1512 from middleman/hostname
...
Encode hostnames to fix #1510
2015-05-06 14:36:26 +01:00
yterajima
c444b3f232
fixed 'after_render' hook is not work.
...
- 'before_render' hook is called twice.
- add simple cucumber test about some hooks.
2015-05-06 16:28:01 +09:00
Eliott Appleford
27684e2ef3
Encode hostnames to fix #1510
2015-05-05 23:56:08 +01:00
Thomas Reynolds
486d34a2c1
prep beta.2
2015-05-04 11:05:00 -07:00
Thomas Reynolds
4626193f97
Fix show_exceptions
2015-05-04 10:50:35 -07:00
Thomas Reynolds
9d3c30ee53
Fix subscriber contract failure
2015-05-04 10:45:03 -07:00
Thomas Reynolds
cee53d0f2d
Fix bad merge from v3-stable
2015-05-04 10:02:32 -07:00
Thomas Reynolds
ee0f9f00f5
Tweak callback delegation
2015-05-04 09:58:29 -07:00
Thomas Reynolds
de5234818d
Prep
2015-05-04 09:40:33 -07:00
Thomas Reynolds
08c3969eb3
Merge pull request #1509 from bhollis/localhost
...
Address shortcomings in #1508
2015-05-03 21:39:34 -07:00
Ben Hollis
9f5080edf9
Don't crash when running the preview server and not connected to any network (no public IP)
2015-05-03 18:48:31 -07:00
Ben Hollis
08dee580aa
Address shortcomings in #1508 by removing the "host" parameter, always binding on all interfaces, and printing the preview URL with both the local hostname and the local public IP address.
2015-05-03 17:54:00 -07:00
Thomas Reynolds
69e66b04df
Some immutability tweaks
2015-05-03 17:11:49 -07:00
Thomas Reynolds
bd67f8ad0e
Merge pull request #1508 from bhollis/localhost
...
Port "localhost" preview server URL to v3-stable
2015-05-03 15:51:20 -07:00
Thomas Reynolds
e64954fbff
Finish porting to new callbacks manager
2015-05-03 15:38:23 -07:00
Ben Hollis
126888272c
The preview server URL will once again use the machine's hostname if available.
2015-05-03 15:11:46 -07:00
Ben Hollis
cf58acda30
Clean up commit f366325b3b a bit
2015-05-03 15:11:21 -07:00
Karl Freeman
f366325b3b
return localhost when host is 0.0.0.0 #1011
2015-05-03 14:56:07 -07:00
Ben Hollis
f8e4f6f059
The preview server can now serve over HTTPS using the --https flag. It will use an automatic self-signed cert which can be overridden using --ssl_certificate and --ssl_private_key. These settings can also be set in config.rb.
2015-05-03 14:52:25 -07:00
Thomas Reynolds
9932d0da84
Merge pull request #1507 from bhollis/ssl
...
Allow preview server to use HTTPS
2015-05-03 10:32:48 -07:00
