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

6952 Commits

Author SHA1 Message Date
Shinn Kondo 01d48320fd Merge remote-tracking branch 'upstream/master' 2016-03-23 19:33:22 -05:00
jekyllbot 0c172f6463 Update history to reflect merge of #4533 [ci skip] 2016-03-23 17:01:16 -07:00
jekyllbot 4ce50e3936 Merge pull request #4533 from hgoodman/feature/show-dir-listing 
Merge pull request 4533
 2016-03-23 17:01:16 -07:00
Tom Fejfar 007b7d45dc
Ensure Rouge closes its div/figure properly after highlighting ends. 
Fixes #4474
 2016-03-23 14:04:11 -07:00
jekyllbot b5e459430b Update history to reflect merge of #4700 [ci skip] 2016-03-23 08:46:02 -07:00
jekyllbot d2c754c0fe Merge pull request #4700 from KrzysiekJ/jekyll-paspagon-plugin 
Merge pull request 4700
 2016-03-23 08:46:01 -07:00
Krzysztof Jurewicz 8786163f35 Add jekyll-paspagon plugin 2016-03-23 10:00:13 +01:00
jekyllbot e1fe161071 Update history to reflect merge of #4694 [ci skip] 2016-03-22 15:09:57 -07:00
jekyllbot e873934d60 Merge pull request #4694 from pathawks/pr/xml_escape 
Merge pull request 4694
 2016-03-22 15:09:57 -07:00
jekyllbot f542d817b0 Update history to reflect merge of #4699 [ci skip] 2016-03-22 14:55:55 -07:00
jekyllbot 4cb6b249f1 Merge pull request #4699 from chrisfinazzo/fix-resources-url 
Merge pull request 4699
 2016-03-22 14:55:54 -07:00
chrisfinazzo 27d617a319 Use the correct URL, Fixes #4698 2016-03-22 17:48:57 -04:00
Pat Hawks aeecbd741f
Add test to inspect strings 2016-03-21 15:45:29 -07:00
Pat Hawks b06af5a44f
Use encode for xml_escape filter 2016-03-21 11:07:46 -07:00
jekyllbot 62669d9229 Update history to reflect merge of #4686 [ci skip] 2016-03-21 09:03:53 -07:00
jekyllbot 0a2c8bb26a Merge pull request #4686 from yanisvieilly/patch-1 
Merge pull request 4686
 2016-03-21 09:03:52 -07:00
Yanis Vieilly bbb76a39a2 Update windows.md 
Fix typo on Chocolatey name
 2016-03-20 23:38:45 +01:00
jekyllbot 2736be44c5 Update history to reflect merge of #4491 [ci skip] 2016-03-20 15:34:36 -07:00
jekyllbot 848b1358a1 Merge pull request #4491 from jekyll/ignore-tilde 
Merge pull request 4491
 2016-03-20 15:34:35 -07:00
jekyllbot 526ded00e9 Update history to reflect merge of #4685 [ci skip] 2016-03-20 15:32:46 -07:00
jekyllbot 983cd60a8d Merge pull request #4685 from smacz42/master 
Merge pull request 4685
 2016-03-20 15:32:46 -07:00
AndrewCz a54cedbb72 Additional repo needed for Fedora 23 Workspace 
After running:

    sudo dnf install ruby ruby-devel rubygems nodejs
    sudo dnf group install "C Development and Tools"

I was unable to install Jekyll via `gem` due to an error:

    The compiler failed to generate an executable file. (RuntimeError) You have to install development tools first.

Taken from the [fedoraproject.org](https://developer.fedoraproject.org/tech/languages/ruby/gems-installation.html) Gem page:

>If you installed all the above, but the extensions would still not compile, you are probably running a Fedora image that misses `redhat-rpm-config` >package. In that case gcc compiler would complain about one of the following:

    gcc: error: conftest.c: No such file or directory
    gcc: error: /usr/lib/rpm/redhat/redhat-hardened-cc1: No such file or directory

>To solve this, simply run sudo dnf install `redhat-rpm-config`.

After doing so it downloaded, compiled and installed without a problem.
 2016-03-20 05:53:13 -04:00
AndrewCz bd0cdcd4cb Add installing devel libraries to fedora 
I followed the troubleshooting and came up with `sudo gem install jekyll` unable to generate the binary file because the development libraries were not installed on my system. Per [fedoraproject.org -- Gems](https://developer.fedoraproject.org/tech/languages/ruby/gems-installation.html) this is necessary to install this. The instructions mirror what is listed on that page, but using `yum` instead of `dnf` - which is understandable because RH and CentOS still use `yum`.
 2016-03-20 05:08:05 -04:00
jekyllbot c795acd09f Update history to reflect merge of #4682 [ci skip] 2016-03-19 10:26:06 -07:00
jekyllbot 46c08e5dc1 Merge pull request #4682 from DirtyF/patch-1 
Merge pull request 4682
 2016-03-19 10:26:05 -07:00
DirtyF 4618a2a8b5 replace with @parkr suggestion 2016-03-19 18:22:35 +01:00
Parker Moore c28a17d71f
benchmark: add benchmarks for String#=~ vs String#include? 2016-03-19 10:08:17 -07:00
DirtyF a81bc9773f typo 2016-03-19 12:56:44 +01:00
Frank Taillandier 68892ab693 `future` option also works for collections 
Following the discussion on #4676
 2016-03-19 12:45:25 +01:00
Parker Moore af47b3c1a7
Fix documentation for push/pop/shift/unshift 
/cc https://github.com/jekyll/jekyll/pull/4384
 2016-03-17 15:50:50 -07:00
Aaron Sky 0c73a6ded9
Update Templates Docs to include Array Filters 
PR #2895 merged this in, but there isn't any documentation anywhere for this as far as I can find. All the Stack Overflow answers I could find said it was impossible to push and pop elements from a Liquid array, although that's probably because they were using Shopify's Liquid.

Fixes https://github.com/jekyll/jekyll/pull/4384
 2016-03-17 15:50:18 -07:00
Parker Moore ac9a72482d Lock jemoji to v0.5.1 while we figure out the issue with HTML::Pipeline. 
Reference issue: https://github.com/jekyll/jemoji/pull/37
 2016-03-16 15:28:06 -07:00
jekyllbot b9859489b0 Update history to reflect merge of #4670 [ci skip] 2016-03-16 13:15:27 -07:00
jekyllbot 5930bbfac1 Merge pull request #4670 from jekyll/clean-up-post-url 
Merge pull request 4670
 2016-03-16 13:15:26 -07:00
Parker Moore 4883a24363 PostComparer#post_date use the provided date instead of re-parsing the whole name. 2016-03-15 16:08:32 -07:00
Parker Moore 97efa0f0ce Clean up Tags::PostUrl a bit 2016-03-15 16:06:25 -07:00
Parker Moore 329878c45f Update site version of contributing [ci skip] 2016-03-15 16:05:38 -07:00
Parker Moore bb1bd671b7 Merge pull request #4658 from SuriyaaKudoIsc/patch-20 
Improved content in "License" section in README.markdown
 2016-03-14 12:59:45 -07:00
Parker Moore c006979160 Merge pull request #4659 from SuriyaaKudoIsc/patch-21 
Set protocol of Stack Overflow to HTTPS
 2016-03-14 12:59:25 -07:00
Parker Moore a882c88081 Merge pull request #4660 from SuriyaaKudoIsc/patch-22 
Set protocol of jekyllrb.com to HTTPS
 2016-03-14 12:59:12 -07:00
Suriyaa Kudo 3014444b0e Set protocol of jekyllrb.com to HTTPS 2016-03-12 12:51:58 +01:00
Suriyaa Kudo ebe46f1ddc Set protocol of Stack Overflow to HTTPS 2016-03-12 12:46:59 +01:00
Suriyaa Kudo 417b5a3b2e Improved content in "License" section in README.markdown 2016-03-12 12:42:04 +01:00
jekyllbot e33574b391 Update history to reflect merge of #4647 [ci skip] 2016-03-11 17:43:23 -06:00
jekyllbot 204e3074c9 Merge pull request #4647 from gesa/fix-templates-doc 
Merge pull request 4647
 2016-03-11 17:43:22 -06:00
Aki 15e7c30cc7 Fixes typo on collections 
There was a line referring to the `render` key in `_config.yml` but the actual name of the key is `output`.

Thank you, @parkr!
 2016-03-11 13:03:32 -08:00
jekyllbot e92a46e156 Update history to reflect merge of #4653 [ci skip] 2016-03-11 13:35:23 -06:00
jekyllbot 2ea3bc53d3 Merge pull request #4653 from mlinksva/patch-2 
Merge pull request 4653
 2016-03-11 13:35:22 -06:00
jekyllbot c206df3401 Update history to reflect merge of #4652 [ci skip] 2016-03-11 13:14:53 -06:00
jekyllbot d4c1d97cb3 Merge pull request #4652 from jekyll/clean-sass-cache 
Merge pull request 4652
 2016-03-11 13:14:52 -06:00