Commit graph

2367 commits

Author SHA1 Message Date
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
Eliott Appleford 35e01136fc Merge pull request #1467 from henrik/patch-1
Fix proxy pages link in config template
2015-02-23 16:50:40 +00: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
Thomas Reynolds ad05b33cf6 Merge pull request #1459 from twuni/bugfix/readme-pessimistic-versioning-link
Fixing broken (outdated) link for the Pessimistic Versioning Constraint.
2015-02-19 15:00:21 -08:00
Devin Canterberry ac1e289064 Fixing broken (outdated) link for the Pessimistic Versioning Constraint. 2015-02-19 14:56:19 -08: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
Thomas Reynolds 6a228bc5c9 Merge pull request #1457 from Arcovion/slim-update
Fix slim >= 3.0.0 deprecation warning
2015-02-18 16:33:56 -08: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 f11057c70c change deploy call 2015-02-13 14:42:17 -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
Eliott Appleford eede4a8c5d Merge pull request #1439 from danilovaz/v3-stable
Update copyright date README
2015-02-01 02:53:29 +00:00
Danilo Vaz 19371188b0 Update copyright date README 2015-02-01 00:23:26 -02:00
Dennis Günnewig 0f95d74827 Use guard clause 2015-01-08 14:58:00 +01:00
Dennis Günnewig 88965858ec Disable some quite noisy cops 2015-01-08 14:57:38 +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
Thomas Reynolds f1f5ea3e5d Merge pull request #1422 from jarednorman/fix-file-ending
Fix line ending format in all.js
2015-01-06 10:09:04 -08:00
Jared Norman a4406e7d9c Fix line ending format in all.js
Resolves #1302
2015-01-06 09:06:36 -08:00
Eliott Appleford 96b324cf45 Merge pull request #1415 from dg-ratiodata/feature/upgrade_i18n
Update version of i18n
2014-12-28 21:48:29 +00: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
Thomas Reynolds ceeb93d0e4 Merge pull request #1414 from stevenosloan/feature/support_sidecar_frontmatter_for_proxied_resources
add support for “sidecar” frontmatter at the destination url of proxied resources
2014-12-22 13:14:05 -08: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 4a59ebefe3 Merge pull request #1413 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2014-12-11 19:04:57 -08:00
The Gitter Badger 503c5d382f Added Gitter badge 2014-12-11 17:03:49 +00: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 ab567b1cbd Merge pull request #1405 from dennisreimann/asset_hash-srcset
Asset hashing for image references in srcset
2014-11-16 12:42:51 -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
Thomas Reynolds 20552164aa Merge pull request #1404 from blech75/ignore_git_dir_on_init
exclude .git folder when init'ing a local template
2014-11-13 14:33:01 -08: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
Eliott Appleford 4f93adffcc Merge pull request #1401 from claudiob/bring-fix-1582-from-padrino-against-v3-stable
Import patch to bugfix from Padrino Helpers
2014-11-08 22:22:25 +00: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
Thomas Reynolds ebe2164fe9 Merge pull request #1398 from maxmeyer/feature/switch_current_working_dir
Switch to current working directory during testing
2014-11-03 08:02:48 -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 e36054b605 Merge pull request #1391 from natebird/patch-1
Add 3.3.6 changes to Changelog
2014-10-13 07:47:31 -05:00