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
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
Eliott Appleford
588f42f1df
Merge pull request #1512 from middleman/hostname
...
Encode hostnames to fix #1510
2015-05-06 14:36:26 +01:00
Eliott Appleford
27684e2ef3
Encode hostnames to fix #1510
2015-05-05 23:56:08 +01: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
bd67f8ad0e
Merge pull request #1508 from bhollis/localhost
...
Port "localhost" preview server URL to v3-stable
2015-05-03 15:51:20 -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
Thomas Reynolds
9932d0da84
Merge pull request #1507 from bhollis/ssl
...
Allow preview server to use HTTPS
2015-05-03 10:32:48 -07:00
Ben Hollis
572f86985b
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-02 20:54:58 -07:00
Thomas Reynolds
2b1a4ed1b8
Merge pull request #1393 from AndrewKvalheim/minify-proxied
...
CSS/JS isn't minified when a proxy has removed the file extension.
2015-05-02 14:28:00 -07:00
Thomas Reynolds
56c7ef7905
Merge pull request #1504 from cllns/fix-whitespace
...
Remove spaces on empty lines in default layout.erb
2015-04-26 09:44:31 -07:00
Thomas Reynolds
a43fa14f34
More tests WRT #1503
2015-04-26 09:43:20 -07:00
Thomas Reynolds
4bdf5a9005
Refactor srcset a little
2015-04-26 09:41:50 -07:00
Thomas Reynolds
45ba4bb0d4
Add slim test to asset_hash. WRT #1503
2015-04-26 09:31:39 -07:00
Sean Collins
c1ce3ffd61
Remove spaces on empty lines
2015-04-26 12:16:55 -04:00
Thomas Reynolds
5f9820dc63
Update changelog.
2015-04-24 10:37:03 -07:00
Thomas Reynolds
c30976ccf5
Fix Rack support. Closes #1501
2015-04-24 10:32:05 -07:00
Thomas Reynolds
07eca1e560
Merge pull request #1500 from dperrymorrow/srcset-support
...
Pull request for issue #1396 supporting srcset property in image tags
2015-04-24 09:20:43 -07:00
David Morrow
580431ca43
Resolves issue #1396 supporting srcset
...
allows you to use image_tag helper and have it build the asset urls for
your srcset images, just like it does for your main src. Leaves absolute
urls alone, (having // in the path)
```
<%= image_tage 'pic_1980.jpg', srcset: 'pic_640.jpg 2x, pic_1024.jpg 3x' %>
=> <img src="/images/pic_1980.jpg" srcset="/images/pic_640.jpg 2x, /images/pic_1024.jpg 3x">
```
2015-04-23 17:28:49 -07:00
Thomas Reynolds
60b3bfcee2
Attempt to address #1497
2015-04-16 12:11:52 -07:00
Thomas Reynolds
af486d7d2a
prep
2015-03-24 09:14:33 -07:00
Thomas Reynolds
d845503f50
Add jruby to the list of envs requiring tzinfo-data. Addresses comments in #1458
2015-03-21 11:21:03 -07:00
Thomas Reynolds
7f2048b865
Don't lookup resource for path if the path is absolute. Fixes #1195
2015-03-03 13:09:46 -08:00
Thomas Reynolds
a71589becd
Make preview host and port configurable in config.rb and also expose those variables to extensions which are curious. Closes #1477
2015-03-01 18:17:22 -08:00
