Dennis Günnewig
63e9cd9b5f
Substitue whitespace in name
2015-07-24 13:48:32 -07:00
Thomas Reynolds
c69099c451
Really fix #1568
2015-07-24 13:46:33 -07:00
Thomas Reynolds
0a8ceb24b0
Add test for #1568
2015-07-20 12:13:10 -07:00
Thomas Reynolds
1d69bcd4bc
Merge pull request #1567 from mauro-oto/fix_rubocop_warnings
...
Fix rubocop warnings
2015-07-20 09:09:02 -07:00
Mauro Otonelli
dcc52d967c
Applied Rubocop feedback.
2015-07-19 20:45:45 -03:00
Mauro Otonelli
c11a9e6f39
Removed invalid Rubocop blocks.
2015-07-19 20:45:10 -03:00
Eliott Appleford
4364d754a5
Merge pull request #1564 from mauro-oto/remove_dir_related_deprec_warnings
...
Removed most deprecation warnings from the build.
2015-07-17 01:07:17 +01:00
Thomas Reynolds
d2f8dc9932
Merge pull request #1528 from maxmeyer/feature/listener
...
Support Bind to address for middleman
2015-07-16 15:12:09 -07:00
Thomas Reynolds
df13c62a6b
Revert "Attempt to help #1563 "
...
This reverts commit 55f909d9cf
2015-07-16 11:34:46 -07:00
Mauro Otonelli
68a6eacc33
Removed most deprecation warnings from the build.
2015-07-15 22:03:41 -03:00
Thomas Reynolds
55f909d9cf
Attempt to help #1563
2015-07-15 14:08:51 -07:00
Eliott Appleford
a855b634e6
Merge pull request #1560 from mauro-oto/remove_active_support_json
...
Drop active_support's JSON in favor of native JSON implementation
2015-07-15 12:03:06 +01:00
Mauro Otonelli
d18e5ed973
Locked aruba to ~> 0.7.4, as 0.8 (latest) breaks the build.
2015-07-14 21:32:52 -03:00
Mauro Otonelli
63d6a00ed9
Use native Ruby JSON implementation instead of ActiveSupport's.
2015-07-14 19:30:17 -03:00
Mauro Otonelli
c14fd72d04
Remove unused integer/inflections extension.
2015-07-14 19:26:59 -03:00
Max Meyer
6aa7ce741a
Refactor preview server to support server_name and bind_address
2015-07-01 20:56:56 +02:00
Max Meyer
232aca91bc
Make testing a little bit easier and require features-directory to make subdirectories in cucumber work
2015-07-01 20:56:48 +02:00
Thomas Reynolds
724e249b49
Experiment with activersupport bump
2015-06-23 15:53:12 -07:00
Thomas Reynolds
9abcdaa7f7
Experiment with activersupport bump
2015-06-23 15:49:36 -07:00
Thomas Reynolds
8bbda9ea7b
Whoops again
2015-06-22 11:28:09 -07:00
Thomas Reynolds
709a0d1a6c
Fix previous commit
2015-06-22 10:48:40 -07:00
Thomas Reynolds
3fca2c6961
Add relative argument to stylesheet and javascript helpers. Closes #1539
2015-06-22 10:37:17 -07:00
Thomas Reynolds
e09f7fadb5
Add better error messaging for #1541
2015-06-15 09:58:29 -07:00
Eliott Appleford
3cbe2acaf7
Merge pull request #1540 from middleman/extended-globs
...
Allow extended globs with ignore
2015-06-14 13:26:30 +01:00
Eliott Appleford
70d4671d2c
Allow extended globs with ignore
...
This makes it match the default behaviour of Dir#glob
2015-06-14 12:16:34 +01:00
Thomas Reynolds
6562716aa5
bone head move
2015-06-09 10:42:41 -07:00
Thomas Reynolds
3e46e8139f
Add osx build env
2015-06-09 10:17:47 -07:00
Thomas Reynolds
bb44e59e6e
Blindly attempt to imrpove encoding situation
2015-06-09 10:15:55 -07:00
Thomas Reynolds
915b059e4a
Merge pull request #1535 from maxmeyer/feature/capybara
...
Use capybara to make javascript testing possible
2015-06-09 09:39:01 -07:00
Max Meyer
3935a7cf5f
Use capybara to make javascript testing possible
2015-06-09 06:57:15 +02:00
Thomas Reynolds
a38a20322f
update changelog
2015-06-02 13:58:56 -07:00
Thomas Reynolds
5630395b40
allow bad paths in i18n links. for #850
2015-06-02 13:48:23 -07:00
Thomas Reynolds
ca8655744a
Support relative urls in i18n links. For #850
2015-06-01 13:53:39 -07:00
Thomas Reynolds
5e30ef98a1
Fix new link_to i18n w.r.t. index pages. For #850
2015-06-01 11:51:27 -07:00
Thomas Reynolds
68adbfeb2a
Add to localized content. For #850
2015-06-01 11:32:43 -07:00
Thomas Reynolds
7eedf6b28f
Merge pull request #1533 from akarzim/fix/asset_hash
...
fix #1496 : Asset hashes on WOFF vs WOFF2 fonts get confused
2015-05-28 09:56:48 -07:00
François Vantomme
d7d37e4ae0
fix #1496 : Asset hashes on WOFF vs WOFF2 fonts get confused
...
reverse sorting the extensions regex solves this issue
2015-05-28 16:21:50 +02:00
Eliott Appleford
3b88496803
Merge pull request #1531 from middleman/backport-407a17b
...
Backport "Fix port suggestion from unused ports"
2015-05-28 09:38:13 +01:00
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
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
