Commit Graph

9568 Commits

Author SHA1 Message Date
Tom Johnson
0ecbf40d0e fixes from parkr's review. removed yellow style line. moved tutorials link from primary nav to Help page. removed .giignore change. 2017-02-28 10:15:20 -08:00
jekyllbot
31b8a2ba5c Update history to reflect merge of #5910 [ci skip] 2017-02-27 17:41:57 -05:00
jekyllbot
433a9f99a0 Merge pull request #5910 from infotexture/patch-1
Merge pull request 5910
2017-02-27 17:41:55 -05:00
Roger Sheen
b9c645d4c3 Fix typo in contribution information
Minor subject/verb agreement (use plural “pull request**s**” to agree with verb form)
2017-02-27 23:27:30 +01:00
jekyllbot
21106b5431 Update history to reflect merge of #5905 [ci skip] 2017-02-26 04:47:13 -05:00
jekyllbot
7122810b97 Merge pull request #5905 from Strangehill/patch-2
Merge pull request 5905
2017-02-26 04:47:11 -05:00
Antonio Argote
1f5612dd1b update broken links
where once there was a working url, there's now a broken redirect
2017-02-26 16:02:17 +08:00
Ashwin Maroli
90d7472388 Remove dependency on include from default about.md
This ensures better portability, allowing to switch and preview
themes without having to delete the code block.
2017-02-25 08:37:30 +05:30
jekyllbot
e52fa87665 Update history to reflect merge of #5900 [ci skip] 2017-02-23 03:36:34 -05:00
jekyllbot
71084aee3f Merge pull request #5900 from iBobik/patch-1
Merge pull request 5900
2017-02-23 03:36:32 -05:00
Jan Pobořil
4e913add3e Fixed tutorial for publishing gem to include repo.
gem build lists files by git, so it is needed to have them commited.
2017-02-22 22:58:48 +01:00
jekyllbot
2c75cb1ca7 Update history to reflect merge of #5891 [ci skip] 2017-02-19 11:29:53 -05:00
jekyllbot
4838e04038 Merge pull request #5891 from chunfeilung/patch-1
Merge pull request 5891
2017-02-19 11:29:52 -05:00
Chun Fei Lung
db229a85d7 Remove duplicate footnote_nr from default config
The configuration page lists the footnote_nr kramdown configuration option twice. That seemed a bit much, so I removed one of the two lines.
2017-02-18 17:14:15 +01:00
jekyllbot
6137dccfc0 Update history to reflect merge of #5887 [ci skip] 2017-02-17 04:19:18 -05:00
jekyllbot
8367d731f6 Merge pull request #5887 from philnash/uri-escape-docs-update
Merge pull request 5887
2017-02-17 04:19:17 -05:00
Phil Nash
42a65a57e6 Makes uri_escape template docs more specific.
I didn't know the difference between cgi_escape and uri_escape until it bit me when I had a colon in a title I used uri_escape on. Addressable::URI.encode (from addressable 2.4.0 and later) thought it was a URI and raised an error. I should have been using cgi_escape, which is for strings that will be added to URIs and not uri_escape, which is for encoding strings that are already in a URI.

This commit borrows from the addressable docs to make it more specific so that readers choose uri_escape when they already have a URI and cgi_escape when they are just escaping a plain string.
2017-02-17 02:16:37 +00:00
jekyllbot
c48b12ba9f Update history to reflect merge of #5882 [ci skip] 2017-02-14 02:34:16 -05:00
jekyllbot
8816a24f53 Merge pull request #5882 from felicianotech/posts-is-collection
Merge pull request 5882
2017-02-14 02:34:14 -05:00
jekyllbot
2dde1800a2 Update history to reflect merge of #5883 [ci skip] 2017-02-13 14:23:50 -05:00
jekyllbot
e9457a8e66 Merge pull request #5883 from ivanoats/fix-aerobatic-docs
Merge pull request 5883
2017-02-13 14:23:48 -05:00
Ivan Storck
50292be895 fix typo 2017-02-13 11:40:30 -05:00
Ivan Storck
b181eb2515 fix typo 2017-02-12 17:56:08 -05:00
Ivan Storck
b17c6c2914 update Aerobatic docs 2017-02-12 13:54:46 -05:00
jekyllbot
04ae82b849 Update history to reflect merge of #5878 [ci skip] 2017-02-12 09:21:32 -05:00
jekyllbot
cc7afc170b Merge pull request #5878 from jekyll/convertible-validate-permalink-emptiness-as-string
Merge pull request 5878
2017-02-12 09:21:31 -05:00
Ashwin Maroli
6123175a71 test with pygments 1.1 on all ruby versions 2017-02-11 13:58:23 +05:30
jekyllbot
7484c23ba4 Update history to reflect merge of #5880 [ci skip] 2017-02-11 00:21:20 -05:00
jekyllbot
8b3929b139 Merge pull request #5880 from BlueberryFoxtrot/patch-3
Merge pull request 5880
2017-02-11 00:21:19 -05:00
Ricardo N Feliciano
9ec7969c09 Add note to collections doc on hard-coded collections. 2017-02-11 00:09:16 -05:00
Frank Taillandier
48a94c4051 Merge branch 'master' into ruby-2.4.0 2017-02-11 05:36:23 +01:00
BlueberryFoxtrot
7414ab068a Update installation.md
It --> Jekyll.  
Avoids misreading that "it is possible to get [Windows] running on Windows."
2017-02-11 05:35:50 +01:00
Parker Moore
5bc67c1fb7 Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty 2017-02-10 21:56:43 -05:00
jekyllbot
98e19c3cf5 Update history to reflect merge of #5834 [ci skip] 2017-02-10 21:16:58 -05:00
jekyllbot
2c1991fc16 Merge pull request #5834 from tomjohnson1492/patch-16
Merge pull request 5834
2017-02-10 21:16:57 -05:00
Parker Moore
23808c2ae6 Fix missing trailing comma to alleviate fmt errors
Offenses:

test/test_static_file.rb:151:9: C: [Corrected] Style/TrailingCommaInLiteral: Put a comma after the last item of a multiline hash.
        "collection"    => nil
        ^^^^^^^^^^^^^^^^^^^^^^
2017-02-10 21:16:25 -05:00
Parker Moore
ec234a4ef8 Bump Ruby 2.1 testing up to Ruby 2.1.10 2017-02-10 21:14:07 -05:00
jekyllbot
bcebf58cbd Update history to reflect merge of #5860 [ci skip] 2017-02-10 21:10:11 -05:00
jekyllbot
afe6e3622c Merge pull request #5860 from ashmaroli/exclude-patch
Merge pull request 5860
2017-02-10 21:10:09 -05:00
jekyllbot
7b58bcfc9e Update history to reflect merge of #5871 [ci skip] 2017-02-10 21:08:50 -05:00
jekyllbot
7ea53e0a3f Merge pull request #5871 from jekyll/static-file-drop
Merge pull request 5871
2017-02-10 21:08:49 -05:00
jekyllbot
bdf594317b Update history to reflect merge of #5876 [ci skip] 2017-02-10 14:26:16 -05:00
jekyllbot
5b7cc78912 Merge pull request #5876 from marcanuy/master
Merge pull request 5876
2017-02-10 14:26:15 -05:00
Marcelo Canina
1d44be5421 fix ial css classes in theme doc 2017-02-10 12:34:16 -03:00
Ben Balter
229769e249 add StaticFileDrop 2017-02-08 17:44:47 -05:00
Tom Johnson
755cc6c137 Fixes based on latest review
Mostly I added more detail in the Liquid section.
2017-02-05 20:55:16 -08:00
Ashwin Maroli
3745b24564 update comment for exclude array 2017-02-05 07:55:26 +05:30
Ashwin Maroli
eb36ea095f test overriding default excludes 2017-02-05 01:56:49 +05:30
Ashwin Maroli
2813b9c039 test exclusion of Gemfile 2017-02-05 01:49:38 +05:30
Ashwin Maroli
6316856773 comment out 'exclude:' in config file 2017-02-05 01:28:43 +05:30