github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-31 09:48:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,788 Commits 60 Branches 160 Tags
c4f82f176df654f10d87f8831303cdbe4375dfaf
Commit Graph

8788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jekyllbot
c4f82f176d Merge pull request #5926 from jekyll/allow-releases-from-stable-branches 
Merge pull request 5926
 2017-03-06 20:59:57 -05:00
jekyllbot
085b5f56f3 Update history to reflect merge of #5934 [ci skip] 2017-03-06 20:58:53 -05:00
jekyllbot
9a740bc447 Merge pull request #5934 from ashmaroli/appease-classifier 
Merge pull request 5934
 2017-03-06 20:58:51 -05:00
jekyllbot
3e2875f39c Update history to reflect merge of #5820 [ci skip] 2017-03-06 20:58:05 -05:00
jekyllbot
8e439e673e Merge pull request #5820 from tomjohnson1492/patch-15 
Merge pull request 5820
 2017-03-06 20:58:04 -05:00
Ashwin Maroli
635e3365cc appease classifier-reborn 2017-03-04 23:29:04 +05:30
jekyllbot
ea91864af8 Update history to reflect merge of #5927 [ci skip] 2017-03-03 15:38:25 -05:00
jekyllbot
108b299702 Merge pull request #5927 from PedroLamas/patch-1 
Merge pull request 5927
 2017-03-03 15:38:23 -05:00
Parker Moore
834cb7aaef Merge pull request #5930 from jekyll/release-3-4-1 
Release 3.4.1
 2017-03-03 14:07:24 -05:00
Parker Moore
7b9e64af85 Release post for v3.4.1 2017-03-03 12:09:15 -05:00
Parker Moore
9b91b248ab Release 💎 3.4.1 2017-03-03 12:09:04 -05:00
Pedro Lamas
29ced37641 Navigation has been moved out from docs 
Change introduced in a05e64c9d3 has broken the bottom navigation as the page no longer exists, so I removed it from docs.yml
 2017-03-02 21:54:51 +00:00
Parker Moore
97375b38c7 Appveyor couldn't possibly support what it says it does in the docs. 
https://ci.appveyor.com/project/jekyll/jekyll/build/1.0.1402
 2017-03-02 12:59:34 -05:00
Parker Moore
fa9a80b15f You never really know what 'regexp support' means until you break it. 2017-03-02 12:56:20 -05:00
Parker Moore
1fbca40f0b appveyor: build *-stable branches. 2017-03-02 12:50:36 -05:00
Parker Moore
ac727f22a3 travis: build *-stable branches. 2017-03-02 12:49:54 -05:00
Parker Moore
e2cfd7cb4c rake/release: allow releases from *-stable branches. 2017-03-02 12:49:08 -05:00
jekyllbot
56dfe18c5d Update history to reflect merge of #5920 [ci skip] 2017-03-02 12:32:15 -05:00
jekyllbot
3d5cf99df5 Merge pull request #5920 from jekyll/allow-brief-post-dates 
Merge pull request 5920
 2017-03-02 12:32:13 -05:00
Parker Moore
3e4dbc83e3 Attempt to alleviate strange Windows encoding error. 
Error:
TestGeneratedSite#test_: generated sites should render latest post's content. :
Encoding::CompatibilityError: incompatible character encodings: IBM437 and UTF-8
    C:/projects/jekyll/test/test_generated_site.rb:22:in `include?'
    C:/projects/jekyll/test/test_generated_site.rb:22:in `block (2 levels) in <class:TestGeneratedSite>'
    C:/projects/jekyll/test/test_generated_site.rb:34:in `instance_exec'
    C:/projects/jekyll/test/test_generated_site.rb:34:in `block in create_test_from_should_hash'
 2017-03-01 22:36:25 -05:00
Parker Moore
ca87c99a3c Fix fmt issues in test for 'include a post with a abbreviated dates' 2017-03-01 22:08:21 -05:00
Parker Moore
4085e29f80 Document::DATE_FILENAME_MATCHER: allow abbreviated dates in post filenames 2017-03-01 21:39:23 -05:00
Parker Moore
8a0c0727ea Failing test: abbreviated post dates are no longer read. 
This is a regression introduced by https://github.com/jekyll/jekyll/pull/5609.
 2017-03-01 21:38:55 -05:00
jekyllbot
0300a7017b Update history to reflect merge of #5916 [ci skip] 2017-02-28 21:21:27 -05:00
jekyllbot
3551bf6d84 Merge pull request #5916 from jekylltools/master 
Merge pull request 5916
 2017-02-28 21:21:26 -05:00
jekylltools
f7d1a9c999 update plugin URL to reflect repo move 2017-02-28 17:32:40 -08:00
jekyllbot
05790460c1 Update history to reflect merge of #5698 [ci skip] 2017-02-28 14:04:53 -05:00
jekyllbot
eaa2124226 Merge pull request #5698 from tomjohnson1492/patch-12 
Merge pull request 5698
 2017-02-28 14:04:51 -05:00
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
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