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

7052 Commits

Author SHA1 Message Date
Florian Thomas 46dd5cf5a2
add failing test for scope values in subdirs 
ref #4458
 2016-04-18 13:55:51 -07:00
jekyllbot 8257f0abd9 Update history to reflect merge of #4786 [ci skip] 2016-04-15 09:15:14 -07:00
jekyllbot f922e8994a Merge pull request #4786 from jekyll/convertible-use-doc-frontmatter-regexp 
Merge pull request 4786
 2016-04-15 09:15:13 -07:00
jekyllbot b97d9b688e Update history to reflect merge of #4789 [ci skip] 2016-04-15 09:14:33 -07:00
jekyllbot 5e302d7ec6 Merge pull request #4789 from duksis/master 
Merge pull request 4789
 2016-04-15 09:14:32 -07:00
Jordon Bedwell 8144e7620f Update JRuby to 9.0.5.0; Drop the double digit test. 
We've tested enough of the double digit stuff, it's only slowing down our specs and we've got an idea about what's going on with it.
 2016-04-14 14:32:16 -05:00
Hugo Duksis bb307bf6c1 Update Rack-Jekyll Heroku deployment blog post url 
Failed to deploy to heroku by following old blog post  
but after stumbling up on https://github.com/adaoraul/rack-jekyll/issues/20
managed to do it and would like to avoid the trouble for others.
 2016-04-14 18:24:46 +02:00
Parker Moore f210cafdf2
convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files 2016-04-13 23:22:05 -04:00
jekyllbot 519c3eb51f Update history to reflect merge of #4734 [ci skip] 2016-04-13 20:18:12 -07:00
jekyllbot 1cf5c8abd7 Merge pull request #4734 from nsgonultas/master 
Merge pull request 4734
 2016-04-13 20:18:12 -07:00
jekyllbot 7635d08ecf Update history to reflect merge of #4478 [ci skip] 2016-04-13 13:37:29 -07:00
jekyllbot fc0d440201 Merge pull request #4478 from edgemaster/where-exp 
Merge pull request 4478
 2016-04-13 13:37:29 -07:00
Thomas Wood e470cae6da Fix rubocop warning. 2016-04-12 19:11:59 +01:00
Thomas Wood 1ef7653fed Fix minor code style recommendations and typos. 2016-04-12 18:59:56 +01:00
Thomas Wood 66c4ff8800 Add a where_exp filter for filtering by expression 
This commit introduces a where_exp filter, which can be used as follows:
  `{{ array | where_exp: "item", "item == 10" }}`
  `{{ array | where_exp: "item", "item.field > 10" }}`
  `{{ site.posts | where_exp: "post", "post contains 'field'" }}`
  `{{ site.posts | where_exp: "post", "post.array contains 'giraffes'" }}`

This permits a variety of use cases, such as reported in: jekyll#4467,
jekyll#4385, jekyll#2787.
 2016-04-12 18:52:58 +01:00
Parker Moore 64d1a81968
Fix history for #4693 & its cherry-pick into master which doesn't need a history line 2016-04-12 13:40:24 -04:00
Jordon Bedwell 61b17d3dc8 Update History.markdown to reflect the cherry-pick of 2b9e849. 2016-04-12 03:02:34 -05:00
Jordon Bedwell 1efb1d7a58 Fix #4689: Use SSLEnable instead of EnableSSL and make URL HTTPS. 2016-04-12 02:59:48 -05:00
jekyllbot 4907b4c9f2 Update history to reflect merge of #4769 [ci skip] 2016-04-11 19:21:20 -07:00
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