dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,770 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

7770 Commits

Author SHA1 Message Date
jekyllbot 1bc8a83774 Merge pull request #4769 from lorentrogers/lr/update_collection_docs 
Merge pull request 4769
 2016-04-11 19:21:20 -07:00
jekyllbot b0c3e3fa47 Update history to reflect merge of #4771 [ci skip] 2016-04-11 19:17:20 -07:00
jekyllbot 1430b6901d Merge pull request #4771 from menatankush/patch-1 
Merge pull request 4771
 2016-04-11 19:17:20 -07:00
jekyllbot 9880cea627 Update history to reflect merge of #4775 [ci skip] 2016-04-11 19:16:32 -07:00
jekyllbot 42b68261da Merge pull request #4775 from KrzysiekJ/jekyll-i18n_tags 
Merge pull request 4775
 2016-04-11 19:16:31 -07:00
jekyllbot b1a6b21dad Update history to reflect merge of #4781 [ci skip] 2016-04-11 12:09:55 -07:00
jekyllbot b35a2dd66d Merge pull request #4781 from kevee/docs-data-file-format 
Merge pull request 4781
 2016-04-11 12:09:54 -07:00
Kevin Miller 6f000c3807 Made statement about data file format more explicit 
The doc read “These files must be YAML files…” then lists a few
extensions that are not YAML.
 2016-04-10 09:53:50 -07:00
Krzysztof Jurewicz 499339548d Add jekyll-i18n_tags plugin 2016-04-09 13:56:55 +02:00
Ankush Menat cd1d7afd59 Removed Leonard Lamprecht's website 
Removed Leonard Lamprecht's website, he isn't using Jekyll for blogging anymore. Ref - https://medium.com/@leo/jekyll-medium-41a058ac2c91#.36e95k7de
 2016-04-08 14:19:51 +05:30
Loren Rogers f17d0076e0 Updates documentation for collections 
Closes #4687
 2016-04-07 20:28:16 -04:00
Jordon Bedwell 0daf1f5514 Revert moving to 2.1.9 
It seems that Travis has made available 2.1.10 which is for double digit testing but skipped 2.1.10 (for some reason.) This reverts us back to 2.1.8 so that we can maintain a working build since we are triggering no known bugs in 2.1 at this time.
 2016-04-07 16:09:23 -05:00
Jordon Bedwell 5e212648f6 2.1.8 => 2.1.9 2016-04-07 15:57:24 -05:00
Jordon Bedwell 129a0b6b7d Do as Ruby maintainers requested. 
Lets see if anything breaks by using a 2 digit Ruby version number, they are looking for people to see if stuff breaks because this.
 2016-04-07 15:53:32 -05:00
jekyllbot a42d0ad9e9 Update history to reflect merge of #4756 [ci skip] 2016-04-06 18:25:00 -07:00
jekyllbot ec105b3e54 Merge pull request #4756 from keegoid/master 
Merge pull request 4756
 2016-04-06 18:24:59 -07:00
jekyllbot 4528772e20 Update history to reflect merge of #4760 [ci skip] 2016-04-06 17:15:01 -07:00
jekyllbot 5457fa16f6 Merge pull request #4760 from clarkwinkelmann/patch-2 
Merge pull request 4760
 2016-04-06 17:15:00 -07:00
jekyllbot a473b45e35 Update history to reflect merge of #4741 [ci skip] 2016-04-06 17:14:29 -07:00
jekyllbot 41c3dd4cde Merge pull request #4741 from jekyll/sortable-doc-drop 
Merge pull request 4741
 2016-04-06 17:14:28 -07:00
jekyllbot 071e775a55 Update history to reflect merge of #4763 [ci skip] 2016-04-06 09:58:29 -07:00
jekyllbot cb6e2574ce Merge pull request #4763 from shengbinmeng/patch-1 
Merge pull request 4763
 2016-04-06 09:58:29 -07:00
Shengbin Meng 413783c4e8 Fix a typo in pagination doc 2016-04-07 00:35:24 +08:00
Jordon Bedwell daf638b600 Merge pull request #4758 from nscyclone/typo-in-contributing.md 
Fixed a typo in 'contributing'.
 2016-04-05 14:38:24 -05:00
Jordon Bedwell a449512912 Merge pull request #4759 from clarkwinkelmann/patch-1 
Fixed the example fork url in CONTRIBUTING
 2016-04-05 14:38:02 -05:00
Clark Winkelmann 41e2994868 Switch second GitHub Pages link to HTTPS 
This was pretty disturbing
 2016-04-05 20:58:39 +02:00
Clark Winkelmann 51f79a4387 Fixed the example fork url in CONTRIBUTING 2016-04-05 20:51:33 +02:00
nscyclone 6422477c5e Fixed a typo in 'contributing'. 2016-04-05 20:55:51 +03:00
Keegan Mullaney 19a8473023 fix typo 
lcoally => locally

 Changes to be committed:
	modified:   .github/CONTRIBUTING.markdown
	modified:   site/_docs/contributing.md
 2016-04-05 16:49:38 +08:00
jekyllbot e801d55ddf Update history to reflect merge of #4755 [ci skip] 2016-04-04 14:54:33 -07:00
jekyllbot ade2847301 Merge pull request #4755 from awood/master 
Merge pull request 4755
 2016-04-04 14:54:33 -07:00
Alex Wood 7040448b75 Add entry linking to the Hawkins plugin. 2016-04-04 16:23:30 -04:00
Alex Hoyau eb4e9dd347 more form baas 2016-04-04 19:07:57 +02:00
Parker Moore d5b26c94d2 Merge pull request #4750 from SuriyaaKudoIsc/patch-23 
Small edits in .github/CONTRIBUTING.markdown
 2016-04-03 20:32:03 -07:00
Parker Moore eadba642ce Merge pull request #4751 from SuriyaaKudoIsc/patch-24 
Set protocol of jekyllrb.com to HTTPS
 2016-04-03 20:31:32 -07:00
Suriyaa Kudo 387c40f667 Set protocol of jekyllrb.com to HTTPS 2016-04-03 10:28:09 +02:00
Suriyaa Kudo 2bd3815b42 Small edits 2016-04-03 10:25:18 +02:00
jekyllbot df2a92cb39 Update history to reflect merge of #4717 [ci skip] 2016-03-31 18:40:15 -07:00
jekyllbot a224491d20 Merge pull request #4717 from jekyll/cleanup-launch-browser 
Merge pull request 4717
 2016-03-31 18:40:15 -07:00
jekyllbot 7861f12727 Update history to reflect merge of #4537 [ci skip] 2016-03-31 18:37:33 -07:00
jekyllbot 6ee728efcb Merge pull request #4537 from Crunch09/fix-warnings 
Merge pull request 4537
 2016-03-31 18:37:32 -07:00
jekyllbot ba9a28474f Update history to reflect merge of #4720 [ci skip] 2016-03-31 18:31:18 -07:00
jekyllbot 6c9200252a Merge pull request #4720 from jekyll/feature/upgrade-rake 
Merge pull request 4720
 2016-03-31 18:31:17 -07:00
Parker Moore 4b471fe9fb
DocumentDrop: add `#<=>` which sorts by date (falling back to path) 2016-03-31 13:41:59 -07:00
Enes Gönültaş d576d7bfae Added an explicit rerun note 2016-03-30 17:16:25 +03:00
Jordon Bedwell f80321ecac Update Rake. 
Update Rake and disable verbosity when running the specs because we have some
deprecated usage (for now -- however, see: jekyll/jekyll#4719) and because
Rouge, and Liquid throw out thousands (probably hyperbolic) of warnigns when the
specs are being ran.  We need upstream to fix their problems while we fix ours
or we'll all have a bad day, not that we aren't already.
 2016-03-27 22:22:35 -05:00
Jordon Bedwell 06ab708edf Don't blindly assume the last-system. 
As it was we assumed that any system that wasn't Windows or OS X must be Linux
but the reality of that can be very unlikely. BSD is popular in some places and
it's not Linux and this would cause an error there.  If we do not know the
launcher for a platform we should ship an error and have the user file
a bug if they feel it necessary and skip the launch otherwise.
 2016-03-27 21:41:23 -05:00
Pierre Fenoll 9347e90a67 Use EntryFilter throughout & update tests 2016-03-26 16:40:19 +01:00
Pierre Fenoll 4aadfe9fd7 Add test that filters out symlink pointing outside site source 2016-03-26 14:16:43 +01:00
Pierre Fenoll bbd2a2b7f1 Rename EntryFilter#bad_symlink? to EntryFilter#symlink_outside_site_source? 2016-03-26 13:12:08 +01:00