Commit Graph

5915 Commits

Author SHA1 Message Date
Veres Lajos
d652f6e337 typofix in test/test_regenerator.rb 2015-08-08 21:28:36 +01:00
Veres Lajos
aecfe4c160 typofix in site/_docs/plugins.md 2015-08-08 21:27:03 +01:00
Parker Moore
7c8e24a488 Update history to reflect merge of #3895
[ci skip]
2015-08-05 14:31:48 -07:00
Parker Moore
d1620db235 Merge pull request #3895 from jekyll/update-contrib
Merge pull request 3895
2015-08-05 14:31:13 -07:00
Parker Moore
489b9c3639 update contributing documentation to reflect workflow updates 2015-08-05 14:30:35 -07:00
Parker Moore
11230718a4 Update history to reflect merge of #3894
[ci skip]
2015-08-05 14:19:38 -07:00
Parker Moore
7970abebf6 Merge pull request #3894 from nateberkopec/change-contributing-md
Merge pull request 3894
2015-08-05 14:17:59 -07:00
Nate Berkopec
1f29e5b5dc Contributing.md should refer to script/cucumber 2015-08-05 17:09:21 -04:00
Parker Moore
44f0e5b14a Update history to reflect merge of #3891
[ci skip]
2015-08-05 10:19:09 -07:00
Johan Bové
d3c327e184 Further flesh out Continuous Integration guide
More information added after having some trouble getting Travis to execute with the existing explanation.
2015-08-05 10:16:22 -07:00
Parker Moore
a849674f7d Update history to reflect merge of #3820
[ci skip]
2015-08-04 16:16:15 -07:00
Parker Moore
627af07c3e Merge pull request #3820 from chrisfinazzo/configuration-docs
Merge pull request 3820
2015-08-04 16:15:59 -07:00
Parker Moore
e9b1f6db3d Update history to reflect merge of #3852
[ci skip]
2015-08-04 16:15:24 -07:00
Parker Moore
585cd268ef Merge pull request #3852 from jekyll/reorganize-gemfile
Merge pull request 3852
2015-08-04 16:15:02 -07:00
Parker Moore
775645e31c Update history to reflect merge of #3865
[ci skip]
2015-08-04 16:14:28 -07:00
Parker Moore
86696f6322 Merge pull request #3865 from mushishi78/static-publisher-documentation
Merge pull request 3865
2015-08-04 16:13:28 -07:00
Parker Moore
84ca5780df Update history to reflect merge of #3880
[ci skip]
2015-08-04 16:12:56 -07:00
Parker Moore
1b88345933 Merge pull request #3880 from probins/patch-1
Merge pull request 3880
2015-08-04 16:12:39 -07:00
Parker Moore
76c96fc7ac Update history to reflect merge of #3883
[ci skip]
2015-08-04 16:12:19 -07:00
Parker Moore
6fee5e3066 Merge pull request #3883 from codeinpink/patch-1
Merge pull request 3883
2015-08-04 16:12:02 -07:00
Parker Moore
90586d229c Update history to reflect merge of #3787
[ci skip]
2015-08-04 16:11:51 -07:00
Parker Moore
b4ac044c29 Merge pull request #3787 from TWiStErRob/hl_lines
Merge pull request 3787
2015-08-04 16:10:43 -07:00
Robert Papp
371ca58e69 Fixes #3776 by changing to the correct name for whitelisting. 2015-08-05 00:20:14 +02:00
Peter Robins
5cfef073a5 Add site.html_files to variables docs and improve site.html_pages 2015-08-04 07:59:03 +00:00
Shannon
432ff579d9 Add Jekyll Portfolio Generator to list of plugins 2015-08-01 13:47:45 -05:00
Parker Moore
0b79059310 Update history to reflect merge of #3848
[ci skip]
2015-07-31 10:33:05 -07:00
Parker Moore
1eba5093bd Merge pull request #3848 from vitalyrepin/patch-1
Merge pull request 3848
2015-07-31 10:32:42 -07:00
Vitaly Repin
498ad6e83a Detailed instructions for rsync deployment method
Extended documentation on rsync-approach. It also mentions rrsync wrapper script which restricts access for rsync to the server. Based on my blog post here: http://vrepin.org/vr/JekyllDeploy/

Restored previous version of 'Rsync' section and renamed it to 'scp' to reflect the content

Misspelling corrected: authorized_keys, not auhorized_key
2015-07-31 16:44:53 +03:00
Parker Moore
611489aae1 Update history to reflect merge of #3838
[ci skip]
2015-07-28 11:29:42 -07:00
Parker Moore
14e6809bcd Merge pull request #3838 from gynter/issue-3836
Merge pull request 3838
2015-07-28 11:29:01 -07:00
Jordon Bedwell
3e29aaf785 Update history.markdown to reflect the commit 3ab386f1b0 2015-07-24 23:46:17 -05:00
Jordon Bedwell
3ab386f1b0 Update to JRuby 9K
Even though JRuby 9K on Travis still apparently points to pre1 we are updating so that when it finally points to stable release we can get those builds, once jruby-head diverges enough again we will re-add it to the list and start testing the next build and move JRuby 9K.  Remember though, JRuby support is still experimental.
2015-07-24 23:43:55 -05:00
Max White
8c485155ce Added documentation for new Static Publisher tool 2015-07-24 23:38:36 +01:00
Parker Moore
fe36329004 Update history to reflect merge of #3858
[ci skip]
2015-07-19 20:26:11 -07:00
Parker Moore
0eee6990d1 Merge pull request #3858 from AJ-Acevedo/shebang
Merge pull request 3858
2015-07-19 20:25:42 -07:00
AJ Acevedo
b0fa2462a6 Updated the scripts shebang for portability
- Updated all of the sh and bash shebangs for consistency and portability.
- set -e to the test script for portability
Resolves #3857
2015-07-18 22:23:56 -04:00
Jordon Bedwell
5af105ca71 Try to organize dependencies into dev and test groups. 2015-07-16 16:31:30 -05:00
Jordon Bedwell
56622c7ab6 Update history.markdown to reflect the merger of #3853. 2015-07-16 14:16:47 -05:00
Jordon Bedwell
e164c2194d Merge pull request #3853 from jekyll/update-kramdown
Update Kramdown.
2015-07-16 14:15:52 -05:00
Jordon Bedwell
910cab5f84 Update history.markdown to reflect the merger of #3845. 2015-07-16 08:39:57 -05:00
Jordon Bedwell
48d6eea9b2 Merge pull request #3845 from fw42/fix_binread
Fix reading of binary metadata file
2015-07-16 08:38:57 -05:00
Jordon Bedwell
dba6df907f Update Kramdown. 2015-07-16 08:36:44 -05:00
Florian Weingarten
8bdfdae0ab Fix reading of binary metadata file 2015-07-09 13:40:36 -04:00
Jordon Bedwell
90514b3536 Allow jRuby head to fail. 2015-07-06 17:52:50 -05:00
Parker Moore
eeb6ef46f1 Update history to reflect merge of #3837
[ci skip]
2015-07-06 12:01:25 -07:00
Parker Moore
32c3089ea9 Merge pull request #3837 from jensechu/master
Merge pull request 3837
2015-07-06 12:00:37 -07:00
Günter Kits
b9f8fc1715 Fixes #3836. Fix site template header menu iteration variables 2015-07-06 21:02:56 +03:00
Jensen Kuras
f4bbbd6952 Fixed an unclear code comment 2015-07-06 10:43:28 -07:00
Jordon Bedwell
5bf5c36ce0 Close #3833 by removing execute bit. 2015-07-04 04:59:06 -05:00
Jordon Bedwell
feb84043dd Update history.markdown to reflect the merger of #3823. 2015-07-01 12:07:04 -05:00