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
Thomas Reynolds
ddc048e075
swap rbx for another jruby
2015-01-04 16:10:58 -06:00
Thomas Reynolds
69f8245f7b
bump
2015-01-04 15:42:22 -06:00
Thomas Reynolds
39c7c9df54
fix leftover flag
2015-01-04 15:28:13 -06:00
Thomas Reynolds
857c99fab5
attempt to fix interactive cli timeout
2015-01-04 15:23:37 -06:00
Thomas Reynolds
8e743aea94
fix interactive init test
2015-01-04 15:06:14 -06:00
Thomas Reynolds
96e05128a1
attempt to improve travis perf
2015-01-04 14:42:06 -06:00
Thomas Reynolds
f16510d034
Update CLI
2015-01-04 14:23:35 -06:00
Thomas Reynolds
302a891bbb
Update some deps
2015-01-03 14:32:21 -06: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
eb1a658b25
over calling change callbacks which are unnecessary.
2014-12-26 14:11:58 -08:00
Thomas Reynolds
ef0b996004
blog compat
2014-12-24 11:38:54 -08:00
Thomas Reynolds
ee4c68b03c
prep alpha, backwards compat
2014-12-23 14:54:21 -08: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
d8e8b06cb6
merge v3
2014-11-19 09:04:56 -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
be98103e05
An attempt to fix #1402
2014-11-09 11:30:11 -08: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)
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
91d0d39569
stylistic change
2014-10-20 11:19:30 -07:00
Thomas Reynolds
c7922c4a35
move actual type detection to sprockets
2014-10-18 12:56:52 -05:00
Thomas Reynolds
6a3d2e7e4e
slightly better types debug message
2014-10-18 12:50:18 -05:00
Thomas Reynolds
d0a9f01b2f
Treat source file types more like tags, allow a set of them
2014-10-18 12:45:49 -05:00
Thomas Reynolds
54e10cf472
yield self along with options in extension activation
2014-10-18 12:11:18 -05:00
Thomas Reynolds
127fba17ef
Merge pull request #1307 from middleman/collections
...
Collections
2014-10-15 17:19:43 -05:00
Thomas Reynolds
a95dbb6367
Collections
2014-10-15 14:34:53 -05:00
Thomas Reynolds
445443cffc
Add a bit of laziness
2014-10-15 14:25:06 -05: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
