github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 09:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,659 Commits 60 Branches 160 Tags
e32daaedb46d500fa6ff8df8987dc505c23db6f7
Commit Graph

6659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Schildt
e32daaedb4 fix(rake) fix broken site generation 
- Fix broken site generation caused by renamed CONDUCT.markdown file.
 2016-02-02 02:17:48 +02:00
Parker Moore
a820f8d9c8 Merge pull request #4434 from chris72205/master 
fix broken link to CONDUCT.markdown in README.markdown
 2016-02-01 14:21:48 -08:00
Chris
6e76f85b52 fix broken link to CONDUCT.markdown in README.markdown 2016-02-01 15:44:20 -06:00
jekyllbot
2814838406 Update history to reflect merge of #4410 [ci skip] 2016-02-01 11:42:21 -08:00
jekyllbot
def633060d Merge pull request #4410 from michaellee/patch-1 
Merge pull request 4410
 2016-02-01 11:42:20 -08:00
jekyllbot
1d58938f4b Update history to reflect merge of #4429 [ci skip] 2016-02-01 10:49:44 -08:00
jekyllbot
f89c180188 Merge pull request #4429 from toshimaru/jekyll-toc 
Merge pull request 4429
 2016-02-01 10:49:44 -08:00
Parker Moore
36591f5d28 Merge pull request #4424 from SuriyaaKudoIsc/patch-1 
Rename CONDUCT.md to CONDUCT.markdown
 2016-02-01 10:39:04 -08:00
Michael Lee
99aabaaf16 Docs: Quickstart - removed alternatively 2016-02-01 10:22:31 -05:00
toshi
183ea08de6 Add jekyll-toc plugin 2016-01-31 00:47:06 +09:00
Suriyaa Kudo
6e93dbbbd1 Rename CONDUCT.md to CONDUCT.markdown 2016-01-30 13:08:12 +01:00
Parker Moore
932d6641bc Add link to diff between CoC's in release post. 2016-01-29 16:00:04 -08:00
Parker Moore
9dc273ca50 Release 💎 3.1.1 v3.1.1 2016-01-29 15:12:29 -08:00
Parker Moore
39ac364b2c CoC must be redirected from an HTML link due to bug in jekyll-redirect-from 
https://github.com/jekyll/jekyll-redirect-from/pull/96
 2016-01-29 15:12:17 -08:00
Parker Moore
c6dde4af51 Merge pull request #4423 from jekyll/release-3-1-1 
Release 💎 v3.1.1
 2016-01-29 15:10:54 -08:00
Parker Moore
6fbd965509 Update site/latest_version.txt 2016-01-28 21:08:26 -08:00
Parker Moore
bfee5c5b59 Release 💎 v3.1.1 2016-01-28 20:36:51 -08:00
jekyllbot
1d1ffdff9b Update history to reflect merge of #4404 [ci skip] 2016-01-28 17:20:34 -08:00
jekyllbot
00d753612c Merge pull request #4404 from jekyll/bom-it 
Merge pull request 4404
 2016-01-28 17:20:33 -08:00
Parker Moore
eb5be62cba Upgrade 2-3 docs, include note about getting one single collection 
Yay, @pathawks! https://github.com/jekyll/jekyll/issues/4392#issuecomment-174369983
 2016-01-28 17:19:24 -08:00
Parker Moore
98a64c8783 Merge pull request #4419 from chrisfinazzo/punctuation 
Small style fix
 2016-01-28 14:37:36 -08:00
Parker Moore
cc390d1a80 Merge pull request #4422 from kpym/patch-1 
Correct indent in yaml preamble
 2016-01-28 14:31:57 -08:00
jekyllbot
0deae96a75 Update history to reflect merge of #4409 [ci skip] 2016-01-28 14:21:41 -08:00
jekyllbot
0b32252506 Merge pull request #4409 from alfredxing/fix-test-stdout 
Merge pull request 4409
 2016-01-28 14:21:40 -08:00
Kroum Tzanev
5d126350d6 Correct indent in yaml preamble 2016-01-28 22:20:40 +01:00
chrisfinazzo
8592aed284 Small style fix 2016-01-28 10:45:16 -05:00
Michael Lee
6c4a1bf00e Docs: Quickstart - added documentation about the --force option if directory is not empty 2016-01-27 22:22:12 -05:00
Alfred Xing
5fc48ffcb9 Suppress stdout in liquid profiling test 
The test was spewing out some whitespace
 2016-01-27 14:06:48 -08:00
jekyllbot
e898b6e8bd Update history to reflect merge of #4403 [ci skip] 2016-01-27 11:01:26 -08:00
jekyllbot
6cd393c8ef Merge pull request #4403 from jekyll/page.dir-must-have-slash 
Merge pull request 4403
 2016-01-27 11:01:25 -08:00
Parker Moore
b1868983c7 Add test for Page#dir in :date/nil modes 2016-01-27 08:44:59 -08:00
Parker Moore
9daebe8dd2 Use improved Page#dir 2016-01-27 08:32:36 -08:00
Parker Moore
b70ee10198 Add benchmarks for Page#dir 2016-01-27 08:28:41 -08:00
Parker Moore
aad54c9a87 Add Utils.merged_file_read_opts to unify reading & strip the BOM 2016-01-26 17:08:54 -08:00
Parker Moore
38b64faeb2 Page#dir: ensure it ends in a slash 2016-01-26 16:44:30 -08:00
Jordon Bedwell
ce77fe6488 Update history.markdown to reflect the merger of #4402 2016-01-26 06:55:55 -06:00
Jordon Bedwell
a13102f039 Merge pull request #4402 from davidcelis/update-code-of-conduct 
Update the Code of Conduct to the latest version
 2016-01-26 06:54:59 -06:00
David Celis
ea5e3d56f5 Update the Code of Conduct to the latest version 
The Contributor Code of Conduct is now at version 1.3.0 and has several
changes. Many of these are simply wording changes, but an important note
is added that project maintainers must maintain confidentiality when
dealing with any code of conduct violations. Additionally, a note is
added that states violations will be investigated and dealt with in a
way that is deemed necessary and appropriate based on the circumstances.

Signed-off-by: David Celis <me@davidcel.is>
 2016-01-25 18:40:16 -08:00
jekyllbot
74fb4aca16 Update history to reflect merge of #4401 [ci skip] 2016-01-25 15:49:23 -08:00
jekyllbot
a4ba8246d7 Merge pull request #4401 from jekyll/fix-documents-with-permalink-with-slash 
Merge pull request 4401
 2016-01-25 15:49:22 -08:00
Parker Moore
d7ff4234f0 Renderer#output_ext: honor folders when looking for ext 
Previously, even if the document permalink was a folder, it would look for
an extension on that.  For example, if I have:

    permalink: "/new-version-jekyll-v3.0.0/"

the output_ext would be ".0".  Now, the output_ext honors the trailing
slash and will report based on the converters instead.
 2016-01-25 15:32:44 -08:00
Parker Moore
e940dd1be4 Site: make github-pages project page url structure refer to site.github.url 2016-01-25 14:09:22 -08:00
Parker Moore
29da9024ca Today, not yesterday. 2016-01-24 13:17:38 -08:00
Parker Moore
778fa4cc0e Release 💎 3.1.0 v3.1.0 2016-01-24 13:13:53 -08:00
Parker Moore
55910f19c3 Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Make our .travis.yml a little easier to maintain.
  Update History.markdown to reflect the merger of #4394
  Minor spelling error
 2016-01-24 13:13:21 -08:00
Parker Moore
368f5b67a9 Release 💎 3.1.0 2016-01-24 13:13:15 -08:00
Jordon Bedwell
c5818d1837 Make our .travis.yml a little easier to maintain. 2016-01-24 09:50:02 -06:00
Jordon Bedwell
ab8f2d6bb1 Update History.markdown to reflect the merger of #4394 2016-01-24 08:40:31 -06:00
Jordon Bedwell
7b5febdcd5 Merge pull request #4394 from j26design/patch-1 
Minor spelling error
 2016-01-24 08:39:35 -06:00
John Perry
96b80b1a72 Minor spelling error 2016-01-23 23:27:17 -07:00