github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 17:28:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,933 Commits 60 Branches 160 Tags
8927898e1fbcf112e6552e1df900485d3ae9b94a
Commit Graph

5933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Parker Moore
8927898e1f Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change 
Merge pull request 3871
 2015-08-23 12:55:00 -07:00
Matt Rogers
753bdbefbf Update history to reflect merge of #3925 [ci skip] 2015-08-21 10:36:39 -05:00
Matt Rogers
8c509bcf40 Merge pull request #3925 from jekyll/code-of-conduct 2015-08-21 10:36:36 -05:00
Parker Moore
a446589cdc Add a Code of Conduct. 
Closes #3924.
 2015-08-20 10:17:37 -07:00
jaybe@jekyll
4c1427c400 docs: Update _data in "Directory structure" 
Add in references to _data format and extension options of .csv, .json,
etc., consistent with _docs/datafiles.md

Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2015-08-17 09:39:44 -07:00
Parker Moore
1c767febe5 Merge pull request #3918 from gangsthub/patch-2 
I think you made a typo there
 2015-08-17 09:31:37 -07:00
BRAVO
47c9ed0829 I think you made a typo there 
as seen on:
http://blog.davepoon.net/2015/01/19/setting-up-sass-with-jekyll/
http://markdotto.com/2014/09/25/sass-and-jekyll/#create-a-sass-stylesheet
 2015-08-17 13:23:17 +02:00
Parker Moore
010038e78a Update history to reflect merge of #3782 
[ci skip]
 2015-08-16 13:32:18 -04:00
Parker Moore
44a43b757d Merge branch 'fniephaus-_includes' into 'master' 
* fniephaus-_includes:
  Unify renaming of configuration options to a single method. /cc #3782.
  Make _includes directory configurable; closes #2684
 2015-08-16 13:30:45 -04:00
Parker Moore
399606c544 Unify renaming of configuration options to a single method. /cc #3782. 2015-08-16 13:30:39 -04:00
Parker Moore
8b72f14217 Update history to reflect merge of #3892 
[ci skip]
 2015-08-16 13:17:24 -04:00
Parker Moore
63a51df909 Fix up test for 'future' flag. /cc #3892 2015-08-16 13:15:47 -04:00
Nate Berkopec
559cd6c7e7 Future should be set to false in the default config 2015-08-16 13:11:08 -04:00
Fabio Niephaus
2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes 
Conflicts:
	bin/jekyll
 2015-08-09 16:22:33 +01:00
Fabio Niephaus
ac56e9dd16 Make _includes directory configurable; closes #2684 
and rename `plugins`, `layouts` and `data_source` directories for consistency
 2015-08-09 16:20:58 +01:00
Jordon Bedwell
af3fe0f30d Update history.markdown to reflect the merger of #3897. 2015-08-08 17:39:26 -05:00
Jordon Bedwell
571f75ee64 Merge pull request #3897 from vlajos/typofixes-vlajos-20150807 
Typofixes
 2015-08-08 17:38:12 -05:00
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
Stephen Crosby
7c4f319442 #3870 trigger hooks by owner symbol 2015-07-27 16:23:07 -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