Commit Graph

5168 Commits

Author SHA1 Message Date
Parker Moore e7feae98f5 Merge pull request #3291 from flyinprogrammer/master 2015-01-12 00:33:38 -08:00
Alan Scherger 5e9706e2aa Break when we successfully generate nav link. 2015-01-11 20:42:34 -08:00
Parker Moore 965e3a1173 Update history to reflect merge of #3288 [ci skip] 2015-01-11 16:21:22 -08:00
Parker Moore 09230cde50 Merge pull request #3288 from jaybe-jekyll/patch-1 2015-01-11 16:19:54 -08:00
jaybe@jekyll 312717b56d Update configuration.md
Tweak and simplify language re: `keep_files` and `destination` directory.
2015-01-11 18:08:05 -06:00
jaybe@jekyll f228b31c2e Update configuration.md
Clarify ability to retain generated content in `destination` via the `keep_files` configuration directive.
2015-01-11 13:11:29 -06:00
Parker Moore 244310fbaa Update history to reflect merge of #2767 [ci skip] 2015-01-10 01:53:40 -08:00
Parker Moore 6816b5ea76 Merge pull request #2767 from jekyll/rdiscount-2 2015-01-10 01:53:07 -08:00
Parker Moore 7c8e4d46eb Fix up new output for RDiscount 2. 2015-01-10 00:21:18 -08:00
Parker Moore 585a31d8aa Support RDiscount 2.
Fixes #2747.
2015-01-10 00:21:18 -08:00
Parker Moore e2a5a9dbc1 Update history to reflect merge of #3256 [ci skip] 2015-01-10 00:14:34 -08:00
Parker Moore f2650e7b0f Merge pull request #3256 from XhmikosR/accessibility-tweaks 2015-01-10 00:14:09 -08:00
Parker Moore 8b6a9d66ec Update history to reflect merge of #3258 [ci skip] 2015-01-10 00:12:40 -08:00
Parker Moore 0bf82e9cf7 Merge pull request #3258 from omegahm/symlink-local-tmp 2015-01-10 00:12:06 -08:00
Parker Moore 4e9b0663be Update history to reflect merge of #3279 [ci skip] 2015-01-10 00:09:18 -08:00
Parker Moore b9542c5426 Merge pull request #3279 from jekyll/fix-cross-platform-testing 2015-01-10 00:08:29 -08:00
Parker Moore 0a4bd99e6b Update history to reflect merge of #3271 [ci skip] 2015-01-10 00:05:03 -08:00
Parker Moore 5536f950f9 Merge pull request #3271 from maban/patch-1 2015-01-10 00:04:16 -08:00
Parker Moore 989639256d Update history to reflect merge of #3278 [ci skip] 2015-01-10 00:00:30 -08:00
Parker Moore 9a52d56b5a Merge pull request #3278 from jekyll/kevinushey-bugfix/highlight-whitespace-stripping 2015-01-10 00:00:06 -08:00
Parker Moore a6238c36d5 Fix script/test to be more cross-compatible with other platforms 2015-01-09 23:58:32 -08:00
Parker Moore 730aedd0a3 Add Rake's test loader because it is inconsistently installed. 2015-01-09 23:57:52 -08:00
Parker Moore 4cbd814546 Add support for Windows line feeds too. 2015-01-09 23:55:47 -08:00
Parker Moore cae9d96cc4 Add test for stripping just newlines from code blocks.
Ref #3275.
2015-01-09 23:51:34 -08:00
Parker Moore 8a9c48c7b4 Update history to reflect merge of #3277 [ci skip] 2015-01-09 23:33:21 -08:00
Parker Moore faccf8f802 Merge pull request #3277 from paulrayner/jekyll-asciidoc_plugin 2015-01-09 23:32:49 -08:00
Paul Rayner bce4680182 Add new AsciiDoc plugin gem to list of Jekyll plugins. 2015-01-09 15:41:45 -07:00
Kevin Ushey b92274b101 only strip newlines when rendering highlight blocks (#3265) 2015-01-09 00:07:11 -08:00
Anna Debenham e7c0e313a3 Change collection documentation based on #223
Clarifying what happens if no YAML front matter exists. The current explanation says that Jekyll will generate a file without Front Matter, but it appears this isn't the case.

I'm still not sure if this is the intended behaviour, but this clarifies how it currently works.
2015-01-08 18:39:27 +00:00
Parker Moore d47b882af2 Update history to reflect merge of #3264 [ci skip] 2015-01-07 14:27:17 -08:00
Parker Moore 2f4e5fa28b Merge pull request #3264 from tkrotoff/fix-nav-items-gaps 2015-01-07 14:25:59 -08:00
Tanguy Krotoff c4d617e6aa Fix nav items alignment when on multiple lines 2015-01-07 12:30:48 +01:00
Parker Moore f95d0ba840 Update history to reflect merge of #3172 [ci skip] 2015-01-05 23:19:47 -08:00
Parker Moore 502fd94f2c Merge pull request #3172 from alfredxing/docs-output-overrides 2015-01-05 23:19:12 -08:00
Alfred Xing c58ac78a5e Expose Publisher in Site 2015-01-05 16:13:04 -08:00
Alfred Xing 7655b533c9 Allow documents to set `published` in front matter 2015-01-05 16:11:02 -08:00
XhmikosR b6c197d312 Docs: Assorted accessibility tweaks. 2015-01-05 13:32:35 +02:00
Mads Ohm Larsen 1062fdf89f Use local tmp folder for symlink tests 2015-01-05 09:28:54 +01:00
Mads Ohm Larsen a2b6aa263e Add local tmp folder 2015-01-05 09:28:54 +01:00
Parker Moore 620115a986 Update history to reflect merge of #3261 [ci skip] 2015-01-05 00:08:08 -08:00
Parker Moore 1ca06e70d3 Merge branch 'master' of github.com:jekyll/jekyll
* 'master' of github.com:jekyll/jekyll:
  Use FileList instead of Dir.glob
2015-01-05 00:07:39 -08:00
Parker Moore 919d37fb37 Merge pull request #3261 from flyinprogrammer/master 2015-01-05 00:07:35 -08:00
Parker Moore f7dafb1f04 Update history to reflect merge of #3255 [ci skip] 2015-01-05 00:06:51 -08:00
Parker Moore 6504645c60 Merge pull request #3255 from XhmikosR/readme-badges 2015-01-05 00:06:01 -08:00
Alan Scherger fc0ea20a85 Use FileList instead of Dir.glob 2015-01-04 20:46:43 -08:00
XhmikosR b20a175c27 Switch to shields.io for the README badges.
This way we have consistent badges.

[ci skip]
2015-01-04 13:13:16 +02:00
Parker Moore 2f06f4aad7 Update history to reflect merge of #3254 [ci skip] 2015-01-03 23:06:17 -08:00
Parker Moore ff3fa84b8a Merge pull request #3254 from flyinprogrammer/master 2015-01-03 23:05:57 -08:00
Alan Scherger 7f370cb82f Update rake task site:publish to fix minor bugs.
*  Automate creating gh-pages directory
*  Ensure gh-pages dir always has correct branch checked out
*  Purge gh-pages of files so that a sync of site truly occurs
*  Ensure dot files are synced
*  Be exact with our exclusions to eliminate guess work
2015-01-03 19:50:33 -08:00
Matt Rogers 51951c43e8 Update history to reflect merge of #3253 [ci skip] 2015-01-03 09:49:54 -06:00