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

2526 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds
37845e89c0 Changelog [ci skip] 2015-12-10 13:24:35 -08:00
Thomas Reynolds
9dc144e9f7 Disable stylus test 2015-12-10 13:22:46 -08:00
Thomas Reynolds
67f612a082 Merge pull request #1555 from skybon/patch-1 
Remove showtitle attribute from asciidoc renderer
 2015-11-27 15:31:35 -08:00
Thomas Reynolds
18b12eedcf Merge pull request #1679 from dg-ratiodata/feature/upgrade_aruba 
Upgrade to aruba 0.10.x [WIP]
 2015-11-27 14:12:16 -08:00
Thomas Reynolds
fe74824651 Merge pull request #1686 from stevenosloan/allow_asset_url_to_work_outside_of_a_resource 
Allow asset_url to work outside of a resource context when relative: !true
 2015-11-13 10:35:06 -08:00
Steven Sloan
30335091c8 fix(default_helpers): allow asset_url to work outside of a resource context 
This way calls from extensions/etc can call app.asset_url() and get the correct
path back.

Additionally, an exception will be raised if also using relative assets as the current resource
will be needed in that case.
 2015-11-12 15:27:26 -05:00
Thomas Reynolds
fe4d3a4bb3 Merge pull request #1681 from maxmeyer/feature/server_hook_v3 
Add "before_server"-hook to preview server in v3
 2015-11-11 13:49:57 -08:00
Thomas Reynolds
78fb92d497 Adapt to upstream hooks API change. Fixes #1658 2015-11-11 13:25:17 -08:00
Thomas Reynolds
e86110f506 Merge pull request #1680 from maxmeyer/patch-1 
Add warning to contributing.md
 2015-11-11 13:18:46 -08:00
Dennis Günnewig
2ee07bdcb6 Update CONTRIBUTING.md 2015-11-11 21:52:28 +01:00
Dennis Günnewig
02d25ee883 Add warning to contributing.md 2015-11-11 21:51:35 +01:00
Dennis Günnewig
4e9ae8cc42 Before server hook 2015-11-11 21:49:37 +01:00
Dennis Günnewig
1d2126b9f7 Move HTTPS to server information 2015-11-11 21:39:54 +01:00
Dennis Günnewig
741caab546 Make middleman compatible with aruba 0.10.x 2015-11-09 14:46:48 +01:00
Dennis Günnewig
90d386079d Make it easier for users behind http proxies to install gems from github with bundler 1.x 2015-11-09 14:46:28 +01:00
Thomas Reynolds
77dad2a400 Merge pull request #1674 from LandonSchropp/v3-stable 
Add missing require to default_helpers.rb
 2015-11-02 23:15:34 -08:00
Landon Schropp
d67e5f512b Add missing require to default_helpers.rb 
Helps resolve #1673
 2015-11-02 20:56:39 -08:00
Thomas Reynolds
575423628d Add back full version path, fixes #1671 2015-11-01 09:23:33 -08:00
Thomas Reynolds
c9bb4540b3 Merge pull request #1668 from djpowers/patch-1 
Update link to getting started guide
 2015-10-28 20:34:23 -07:00
Dave Powers
1c94fe989c Update link to getting started guide 
[ci skip]
 2015-10-28 20:50:10 -04:00
Thomas Reynolds
097d19eaca Merge pull request #1661 from tysongach/tg-donation-link 
Update donation link
 2015-10-28 09:15:10 -07:00
Tyson Gach
807bb3264c Update donation link 2015-10-28 09:50:02 -04:00
Thomas Reynolds
8dbd35938d Merge pull request #1659 from glamouracademy/v3-stable 
Add link for RubyGem package manager download
 2015-10-27 10:54:50 -07:00
glamouracademy
ec30622dc3 Merge pull request #1 from glamouracademy/glamouracademy-patch-1 
Add link for RubyGem package manager download
 2015-10-27 12:42:27 -04:00
glamouracademy
601653b766 Add link for RubyGem package manager download 2015-10-27 12:38:16 -04:00
Thomas Reynolds
c2f0db0951 Merge pull request #1650 from jenniferyien/v3-stable 
Update LICENSE.md
 2015-10-24 13:54:33 -07:00
Jenn
3d88530925 Update LICENSE.md 
updated copyright year from 2014 to 2015
 2015-10-23 23:33:39 -04:00
Thomas Reynolds
5f69431a74 Merge pull request #1614 from poporul/v3-stable 
Little bit cleaned up. Dry in rake tasks. Fix $LOAD_PATH
 2015-10-22 19:56:24 -07:00
Thomas Reynolds
a4807496ed Merge pull request #1640 from tommysanterre/Fix_issue_1601_unitialized_constant_on_windows 
Add some requires to help #1601
 2015-10-19 15:32:30 -07:00
Tommy Santerre
546cadf4fd Add some requires to help #1601 2015-10-17 21:53:47 -04:00
Thomas Reynolds
db1e8b8611 add a specific require. hopefully helping #1601 2015-10-17 14:06:50 -07:00
Thomas Reynolds
58e794645b Merge pull request #1633 from dg-ratiodata/feature/preven_crash_due_to_invalid_data_file 
Refactor Data Loader to prevent middleman from crashing due to invalid…
 2015-10-09 12:41:26 -07:00
Dennis Günnewig
492281f9e8 Refator Data Loader to prevent middleman from crashing due to invalid data file 2015-10-09 12:15:09 +02:00
Alexey Pokhozhaev
4d46b84aae Do not run specs if there is no spec directory 2015-10-07 15:59:12 +03:00
Alexey Pokhozhaev
b9cdc2bba4 Run cucumber if features directory exists + removed unused task 2015-10-07 15:29:34 +03:00
Alexey Pokhozhaev
3a7848da9e Little bit cleaned up. Dry in rake tasks. Fix $LOAD_PATH 2015-10-07 14:33:56 +03:00
Thomas Reynolds
8292bc9899 Merge pull request #1625 from ajsharp/patch-1 
Add Errno::ENETUNREACH to exception list in BasicNetworkResolver
 2015-10-05 20:47:19 -07:00
Alex Sharp
9a529cd294 Add Errno::ENETUNREACH to exception list in BasicNetworkResolver 
Fixes #1621
 2015-10-05 11:08:52 -07:00
Thomas Reynolds
529bcca927 Merge pull request #1623 from boone/spellcheck 
Fixed typos.
 2015-10-05 08:21:06 -07:00
Mike Boone
5a4d7352f1 Fixed typos. 2015-10-04 20:59:53 -04:00
Thomas Reynolds
99c2362ee8 Merge pull request #1616 from y-yagi/reomve_unnecessary_require 
remove unnecessary require
 2015-10-04 11:50:46 -07:00
yuuji.yaginuma
65a65b9677 remove unnecessary require 
`require 'rubygems'` is already required in Ruby 1.9 or later.
 2015-10-03 10:06:52 +09:00
Thomas Reynolds
a064ba93b3 Merge pull request #1613 from ne-sachirou/fix/clean_under_hidden_dir 
Fix: Can't clean files when the project is under a hidden directory.
 2015-09-30 23:57:05 -07:00
inoue_sachiro
2aac804e92 Fix: Can't clean files when the project is under a hidden directory. 2015-09-30 21:23:27 +09:00
Thomas Reynolds
2870647097 Merge pull request #1578 from ashfurrow/after_render-fix 
Fixes problem with after_render hooks returning nil.
 2015-09-17 09:35:37 -07:00
Thomas Reynolds
41255e6727 Merge pull request #1599 from nslocum/v3-stable 
Ignore gems installed in local dir.
 2015-09-17 09:03:51 -07:00
Nick Slocum
c09b15a895 specify the root directory. 2015-09-13 11:05:11 -04:00
nslocum
10feaad451 Ignore gems installed in local dir. 2015-09-11 08:42:52 -04:00
Thomas Reynolds
8a349322ac Merge pull request #1593 from komor72/patch-1 
Update middleman-livereload version to more current
 2015-09-03 10:09:54 -07:00
Rafał Komorowski
0d4d82a01a Update middleman-livereload version to more current 
As discussed https://github.com/middleman/middleman-livereload/issues/69 but I forgot to apply the fix to source code inside MM. @tdreyno, should it be `~> 3.3.0` or `~> 3.4.0`? I looked into 3.4 changes and they seem to be MM v4 related?
 2015-09-03 18:25:43 +02:00