deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2484 commits 11 branches 271 tags 23 MiB
Commit graph

971 commits

Author SHA1 Message Date
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
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
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 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
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
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 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 c30976ccf5 Fix Rack support. Closes #1501 2015-04-24 10:32:05 -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
Simon-Pierre LeBel 4e88a66083 Added support for complete path localization 2015-03-19 16:20:19 -04: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
Andrew Kvalheim 8817f4ab38 Move IRB initialization into an overridable method. 2015-02-25 17:11:29 -08:00
Andrew Kvalheim 049dabbf15 Use configurable content type for detection of minifiable content. 
Squashed changes:

  - Prevent side effects of content type testing.
  - Test for inline minification in PHP files.
 2015-02-25 16:08:26 -08:00
Martin Schurig 10ed3c2447
append assets hash also to .woff2 files 2015-02-25 20:43:46 +01:00
Thomas Reynolds fbe71f51e4 Merge pull request #1465 from thomasritz/fix-wrong-parent 
Fixes computation of `parent`.
 2015-02-23 14:18:31 -07:00
Thomas Reynolds a3519bdf37 Bump 2015-02-23 12:28:30 -08:00
Thomas Reynolds cac0484de8 Fixes #1469 2015-02-23 12:26:37 -08:00
Henrik Nyh 55673480dc Fix proxy pages link in config template 
Old link is broken.
 2015-02-22 20:31:28 +01:00
Thomas Ritz 262e976790 Fixes computation of parent. 
If there is a file without a basename in root, e.g. `.htaccess`,
`#parent` of another file in root finds `.htaccess` instead of
`index.html`.

Adding the `.htaccess` to the traversal-app fixture exposes this error.
The fix is to no longer scan for possible files if we know the parent
must be root.
 2015-02-21 19:07:17 +01:00
Eliott Appleford a977f8bf20 Merge pull request #1416 from dg-ratiodata/feature/fix_offenses 
Fix rubocop offenses
 2015-02-19 00:50:46 +00:00
Eliott Appleford 0230e26a8c Fix slim >= 3.0.0 deprecation warning 2015-02-18 14:22:50 +00:00
Thomas Reynolds 1cce64d463 Bump 2015-02-17 16:08:58 -08:00
Thomas Reynolds 14104aad70 Try to avoid *nix double load issue again 2015-02-17 09:39:59 -08:00
Thomas Reynolds fd3d9b206f Attempt to avoid double-load issue 2015-02-16 15:53:21 -08:00
Thomas Reynolds 2f558ec571 Fix test 2015-02-13 14:39:08 -08:00
Thomas Reynolds 4d7b21185f fix strange change to how file contents are checked in aruba 2015-02-13 14:34:15 -08:00
Thomas Reynolds 85c8143d49 bump 2015-02-13 14:31:53 -08:00
Thomas Reynolds 5b39a33ab6 Serve sourcemaps as JSON so extensions which rely on mime-type function correctly 2015-02-13 14:28:12 -08:00
Dennis Günnewig 0f95d74827 Use guard clause 2015-01-08 14:58:00 +01:00
Dennis Günnewig 79dbfa0238 Rubcop found some new offenses 2015-01-08 14:55:03 +01:00
Dennis Günnewig 747ca86212 Fixed offense 2015-01-08 14:53:20 +01:00
Jared Norman a4406e7d9c Fix line ending format in all.js 
Resolves #1302
 2015-01-06 09:06:36 -08:00
Max Meyer 67125a3f91 Supress warning because of method name offense 2014-12-28 10:50:12 +01:00
Max Meyer e69704b540 Fixed whitespace offenses 2014-12-28 10:49:46 +01:00
Max Meyer 488a4b74ab Update version of i18n 2014-12-28 10:36:33 +01:00
Steven Sloan 85fa3fac02 add support for “sidecar” frontmatter at the destination url of proxied resources 
a “cheap” way to support adding data to pages created through `proxy` or `page` by adding frontmatter at the expected destination url.

for example proxying a page to `/proxied.html`, by adding a sidecar frontmatter file at `source/proxied.html.frontmatter` (or source/proxied.frontmatter if directory indexes is activated) the frontmatter will be merged with the proxy source and available to `current_resource` at the destination.
 2014-12-22 13:59:27 -05:00
Thomas Reynolds 29693e4533 More URI encoding and decoding. Addresses #1406 2014-11-19 10:39:48 -08:00
Thomas Reynolds 17eb54b9dc Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable 2014-11-16 12:42:58 -08:00
Thomas Reynolds 3eafb4fcf4 Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable 2014-11-16 12:35:45 -08:00
Dennis Reimann e28ed20c63 Asset hashing for image references in srcset 
Fixes #1287
 2014-11-16 21:25:28 +01:00
justin blecher dcca8968c8 exclude .git folder when init'ing a local template 
freshly init'd middleman projects from a local template should not
include the git files from that template because that's confusing.
this is to help users who clone git repos into `~/.middleman/`.
 2014-11-12 19:12:52 -05:00
Thomas Reynolds c231e00f00 bump 2014-11-08 21:06:17 -08:00
claudiob 9d49b08426 Import patch to bugfix from Padrino Helpers 
Padrino had an issue https://github.com/padrino/padrino-framework/issues/1582
which was solved at 72769fe39a (diff-526024418d0d573e08d46ba3d55c02bcR36)

This commit brings the same fix back into Middleman's method that
overrides Padrino's method.
 2014-11-08 13:01:13 -08:00
Max Meyer f4ce1ff99d Switch to current working directory during testing 2014-11-03 09:17:43 +01:00
Thomas Reynolds 7c37d4ba51 Merge pull request #1338 from dg-ratiodata/feature/chained_templates_partials 
Chained template parsing failed if parent is "html.erb" and child is "html.md.erb"
 2014-10-23 15:25:10 -07:00
Thomas Reynolds 65d3a0c84f Be a bit safer about checking source_file in Sitemap Preview. Working towards fixing #1166 2014-10-20 11:24:52 -07:00
Thomas Reynolds ddfa37faee Use HTTPS by default in new project Gemfiles. Closes #1372 2014-10-12 09:38:14 -05:00
minusfive 17cddce675 Parse asset-hashes on JSON files 2014-09-28 16:39:46 -04:00
Thomas Reynolds 1b0b666130 bump 2014-09-15 15:36:57 -07:00
Thomas Reynolds e326e10e98 listen gem started using full paths instead of relative. Fixes #1374 2014-09-15 15:36:41 -07:00
Dennis Günnewig d45911f7b8 Add force-option to init 2014-09-09 09:19:41 +02:00
Dennis Günnewig 55e3c93278 Feature tests for force-option 2014-09-09 09:19:31 +02:00
Dennis Günnewig b78515ce91 Fixed rubocop offense 2014-09-09 09:02:50 +02:00
Thomas Reynolds 313a2398d4 attempt to get compass 1 working 2014-09-02 12:43:20 -07:00
Thomas Reynolds 5a85d177c2 Catch File read exceptions in frontmatter 2014-08-29 10:24:45 -07:00
Thomas Reynolds 18825e7ced no reason for image sizes to touch the alt attr 2014-08-22 09:36:07 -07:00
Thomas Reynolds 0d2bcbabe9 Remove duplicate attr_accessor. Closes #1352 2014-08-20 09:48:55 -07:00
Thomas Reynolds a1979f11b1 Update sass dep and test new error message 2014-08-20 09:48:03 -07:00
Thomas Reynolds 51d57afc73 require new compass, fix tests 2014-08-17 13:20:29 -07:00
Christian Höltje 6895f30ff3 Accept pandoc-style YAML frontmatter 
Pandoc (and some other tools) have decided to end their YAML frontmatter
with `...` instead of `---`.  In the name of flexibility, this patch
allows either to mark the end of YAML frontmatter.

Example:

```
---
title: No place like home
...
```
 2014-08-15 13:21:30 -04:00
Thomas Reynolds fae0e00f42 Add webp to our image type lists 2014-08-14 09:04:26 -07:00
Thomas Reynolds 2b928a326c Handle breaking padrino change. Closes #1349 2014-08-13 20:24:20 -07:00
Thomas Reynolds 625391953a Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327 2014-08-04 15:07:55 -07:00
Thomas Reynolds 05aa396399 more slim tests. Targets #1327 2014-08-04 14:41:22 -07:00
Thomas Reynolds 1c977a83e2 prep 2014-08-03 08:37:46 -07:00
Thomas Reynolds 724eab3ac9 fix alt tags and add test. Closes #1341 2014-08-03 08:29:29 -07:00
Dennis Günnewig fee6a8b617 Make rubocop happy 2014-07-31 13:13:07 +02:00
Dennis Günnewig 98a36d68f0 Merge branch 'v3-stable' into feature/chained_templates_partials 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
 2014-07-31 13:00:19 +02:00
Dennis Günnewig 856f05709c Support template chaining for partials 2014-07-31 11:39:02 +02:00
Dennis Günnewig 0add2e6676 Added a step to create templates on the fly 2014-07-31 08:46:22 +02:00
Thomas Reynolds b39b913cfb Merge pull request #1337 from dg-vrnetze/feature/new_server_steps 
Added some new steps to test middleman applications
 2014-07-29 07:22:38 -07:00
Max Meyer 398a038523 Support check for status code 2014-07-29 09:04:10 +02:00
Max Meyer 6dc7eb6353 Support should not see block 2014-07-29 09:03:56 +02:00
Thomas Reynolds 2f545cefbe Attempt to allow i18n to override partial lookup. #1333 2014-07-24 11:11:27 -07:00
Thomas Reynolds 15d6210df8 Use the resource instead of the request path for auto asset helpers. Fixes #1326 2014-07-20 13:53:05 -07:00
Thomas Reynolds f0603ddf2f work with static partials. Closes #1206 2014-07-18 10:54:48 -07:00
Eliott Appleford a47b58c58d fix gemfile conflict 2014-07-06 05:48:21 +01:00