Commit Graph

6017 Commits

Author SHA1 Message Date
Jordon Bedwell 7ae044ee44 Update history.markdown to reflect the merge of #4022 2015-10-11 22:17:37 -05:00
Jordon Bedwell e830e7954c Merge pull request #4022 from chrisfinazzo/fix-the-typos
Fixed a typo, wrap at 80 characters
2015-10-11 22:16:40 -05:00
chrisfinazzo 8e1dd75312 Fixed a typo, wrap at 80 characters 2015-10-11 21:09:44 -04:00
Parker Moore 53f975feb4 Update history to reflect merge of #4018
[ci skip]
2015-10-11 14:50:30 -07:00
Parker Moore 1d9c095b80 Merge pull request #4018 from mudpuddle/alternative-instructions-for-el-capitan
Merge pull request 4018
2015-10-11 14:43:18 -07:00
Parker Moore 2410bcc001 Merge pull request #4021 from stomar/fix-indentation
Avoid "mismatched indentations" warning for ruby -w
2015-10-11 14:38:47 -07:00
Parker Moore e7043ac4f3 Update history to reflect merge of #4013
[ci skip]
2015-10-11 14:37:49 -07:00
Parker Moore fa2c8d2a96 Merge pull request #4013 from antonk52/patch-1
Merge pull request 4013
2015-10-11 14:37:00 -07:00
Anton 3eb25217ce Added installation instructions for 2 of the 3 options for plugins.
Fixes #4013.
2015-10-11 14:36:11 -07:00
Marcus Stollsteimer 45902b2047 Avoid "mismatched indentations" warning for ruby -w 2015-10-11 19:49:40 +02:00
Jesse W 611af3f456 added alternative jekyll gem installation instructions 2015-10-09 11:35:18 -07:00
Jordon Bedwell 9b091f8d5d Update Kramdown and reduce it's constraints. 2015-10-09 07:28:02 -05:00
Anton 6cda306bbf Update plugins.md
Corrected display of installing options
2015-10-09 10:23:08 +03:00
Anton bc3e67da62 Update plugins.md
Added gem install and bundle install commands for plugins set up
2015-10-08 21:47:29 +03:00
Matt Rogers b9bdb85a47 Update history to reflect merge of #4015 [ci skip] 2015-10-08 08:53:00 -05:00
Matt Rogers 4e0a803c01 Merge pull request #4015 from takuti/new-plugin-link 2015-10-08 08:52:58 -05:00
takuti 30d82aff5d Update plugins.md 2015-10-08 22:31:15 +09:00
Anton 3435d05c2a Update plugins.md
Note to option 2 and 3 for installing plugins
2015-10-08 10:23:29 +03:00
Anton 464d4b0254 update plugins documentation
you have to install gem files for plugins for them in order to work
2015-10-08 09:59:15 +03:00
Parker Moore 9f4d4bbae0 Update history to reflect merge of #3999
[ci skip]
2015-09-30 21:23:41 -07:00
Parker Moore a1fdf830db Merge pull request #3999 from chrisfinazzo/instructions-for-el-capitan
Merge pull request 3999
2015-09-30 21:23:18 -07:00
chrisfinazzo 9c9481a8a9 Notes for Homebrew, advanced installs, and cleanup 2015-09-30 12:57:09 -04:00
chrisfinazzo ca29e4f585 Feedback from @parkr, rephrasing, and link to Ruby managers 2015-09-28 21:31:27 -04:00
Parker Moore ed7fcf6773 Update history to reflect merge of #4001
[ci skip]
2015-09-28 14:03:30 -07:00
Parker Moore 25cea4d3d2 Merge pull request #4001 from hartmel/master
Merge pull request 4001
2015-09-28 14:02:53 -07:00
hartmel 951c604017 Add timezone as hour & minute offset in the initial post in the new site template. Fixes #3998 2015-09-28 22:18:02 +02:00
chrisfinazzo 269018b011 Instructions for El Capitan 2015-09-27 15:49:24 -04:00
Parker Moore 2807b8a012 Update history to reflect merge of #3997
[ci skip]
2015-09-26 12:35:22 -07:00
Parker Moore 5a765affa3 Merge pull request #3997 from d9n/master
Merge pull request 3997
2015-09-26 12:34:32 -07:00
David Herman 1703b59ce8 Add header message to _config.yml
The first thing new users to Jekyll do is open _config.yml, so this
change adds a simple welcome message to the top of it. Additionally,
it informs the user that the file is not automatically reloaded when
changed, which is a point of confusion for new users.

Related issue: https://github.com/jekyll/jekyll/issues/2302
2015-09-25 18:57:46 -07:00
Parker Moore 85b6d936d8 docs: include backup github-pages Gemfile
Fixes #3985
2015-09-24 16:24:26 -07:00
Parker Moore abcab4b91f Update history to reflect merge of #3992
[ci skip]
2015-09-24 16:07:03 -07:00
Parker Moore e193f5a738 Merge pull request #3992 from jekyll/abort-before-confusing-msg
Merge pull request 3992
2015-09-24 16:06:26 -07:00
Jordon Bedwell 51f32502b9 Update history.markdown to reflect the merge of #3994 2015-09-24 13:42:34 -05:00
Jordon Bedwell c91b622967 Merge pull request #3994 from arthurhammer/patch-1
Fix broken configuration documentation page
2015-09-24 13:41:56 -05:00
Arthur Hammer 16eef80539 Fix broken configuration documentation page 2015-09-24 20:27:03 +02:00
Jordon Bedwell f9925bef2b Update history.markdown to reflect the merge of #3990 2015-09-24 12:59:05 -05:00
Jordon Bedwell e01c40f575 Merge pull request #3990 from pheuko/permalink-timestamp
Added permalink time variables
2015-09-23 23:07:28 -05:00
Pedro Euko 22b59ae793 Added permalink time variables 2015-09-23 21:51:02 -03:00
Parker Moore c7bc76269c Abort if no subcommand.
Fixes #3412
2015-09-23 17:32:33 -07:00
Parker Moore 8563f59125 Update history to reflect merge of #3989
[ci skip]
2015-09-22 21:07:09 -07:00
Parker Moore 1bb8f9cf81 Merge pull request #3989 from tomjohnson1492/patch-1
Merge pull request 3989
2015-09-22 21:06:31 -07:00
Tom Johnson 38a561a14c Made small pull request fixes as noted by Parker 2015-09-22 14:28:32 -07:00
Tom Johnson a82b063d42 Added documentation for Jekyll environment variables
Information about Jekyll environment variables was missing from the documentation. This seemed like a good place to include it.
2015-09-22 09:35:14 -07:00
Parker Moore f3b99ebda7 Release 💎 3.0.0.pre.beta9 2015-09-21 12:31:00 -07:00
Parker Moore 9181d22391 Update history to reflect merge of #3917
[ci skip]
2015-09-21 12:21:35 -07:00
Parker Moore bea64a2cf7 Merge pull request #3917 from leo/patch-1
Merge pull request 3917
2015-09-21 12:21:11 -07:00
Parker Moore 666df42a28 Update history to reflect merge of #3968
[ci skip]
2015-09-21 12:20:43 -07:00
Bruce Smith 402643435d replace broken link; add other Mac-specific info
Fixes #3968
2015-09-21 12:08:51 -07:00
Jordon Bedwell d6b37a1644 Lock Cucumber to 2.0 because 2.1 is broken. 2015-09-11 15:03:07 -05:00