5058382d5a
LiquidRenderer#parse: parse with line numbers.
2016-02-02 14:43:45 -08:00
bbefef20cd
Update history to reflect merge of #4428 [ci skip]
2016-02-02 14:02:00 -08:00
27535e2b3c
Merge pull request #4428 from jekyll/bug/make-config-symbol-accessible
...
Merge pull request 4428
2016-02-02 14:01:59 -08:00
65a1fc4120
Mispell Rouge intentionally.
2016-02-02 12:27:17 -06:00
7ae4973788
Update history to reflect merge of #4437 [ci skip]
2016-02-02 07:42:38 -08:00
a452d0cb29
Merge pull request #4437 from pathawks/rubocop.yml
...
Merge pull request 4437
2016-02-02 07:42:37 -08:00
b1b409433c
Update history to reflect merge of #4436 [ci skip]
2016-02-02 07:41:16 -08:00
7f6d29af5d
Merge pull request #4436 from d2s/d2s-site-linkfix
...
Merge pull request 4436
2016-02-02 07:41:16 -08:00
198103ce7a
Include .rubocop.yml in Gem
2016-02-01 17:46:31 -08:00
8234c01d58
fix(docs) update link to the Code of Conduct
...
- Update links to use `[Code of Conduct](/docs/conduct/)`
- Fix old URL that was pointing to a missing file in GitHub.
2016-02-02 02:19:50 +02:00
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
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
6e76f85b52
fix broken link to CONDUCT.markdown in README.markdown
2016-02-01 15:44:20 -06:00
2814838406
Update history to reflect merge of #4410 [ci skip]
2016-02-01 11:42:21 -08:00
def633060d
Merge pull request #4410 from michaellee/patch-1
...
Merge pull request 4410
2016-02-01 11:42:20 -08:00
1d58938f4b
Update history to reflect merge of #4429 [ci skip]
2016-02-01 10:49:44 -08:00
f89c180188
Merge pull request #4429 from toshimaru/jekyll-toc
...
Merge pull request 4429
2016-02-01 10:49:44 -08:00
36591f5d28
Merge pull request #4424 from SuriyaaKudoIsc/patch-1
...
Rename CONDUCT.md to CONDUCT.markdown
2016-02-01 10:39:04 -08:00
99aabaaf16
Docs: Quickstart - removed alternatively
2016-02-01 10:22:31 -05:00
4d805e29bc
Fix #4427 : Make our @config hash symbol accessible.
2016-01-30 09:48:37 -06:00
183ea08de6
Add jekyll-toc plugin
2016-01-31 00:47:06 +09:00
6e93dbbbd1
Rename CONDUCT.md to CONDUCT.markdown
2016-01-30 13:08:12 +01:00
932d6641bc
Add link to diff between CoC's in release post.
2016-01-29 16:00:04 -08:00
9dc273ca50
Release 💎 3.1.1
2016-01-29 15:12:29 -08:00
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
c6dde4af51
Merge pull request #4423 from jekyll/release-3-1-1
...
Release 💎 v3.1.1
2016-01-29 15:10:54 -08:00
6fbd965509
Update site/latest_version.txt
2016-01-28 21:08:26 -08:00
bfee5c5b59
Release 💎 v3.1.1
2016-01-28 20:36:51 -08:00
1d1ffdff9b
Update history to reflect merge of #4404 [ci skip]
2016-01-28 17:20:34 -08:00
00d753612c
Merge pull request #4404 from jekyll/bom-it
...
Merge pull request 4404
2016-01-28 17:20:33 -08:00
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
98a64c8783
Merge pull request #4419 from chrisfinazzo/punctuation
...
Small style fix
2016-01-28 14:37:36 -08:00
cc390d1a80
Merge pull request #4422 from kpym/patch-1
...
Correct indent in yaml preamble
2016-01-28 14:31:57 -08:00
0deae96a75
Update history to reflect merge of #4409 [ci skip]
2016-01-28 14:21:41 -08:00
0b32252506
Merge pull request #4409 from alfredxing/fix-test-stdout
...
Merge pull request 4409
2016-01-28 14:21:40 -08:00
5d126350d6
Correct indent in yaml preamble
2016-01-28 22:20:40 +01:00
8592aed284
Small style fix
2016-01-28 10:45:16 -05:00
6c4a1bf00e
Docs: Quickstart - added documentation about the `--force` option if directory is not empty
2016-01-27 22:22:12 -05:00
5fc48ffcb9
Suppress stdout in liquid profiling test
...
The test was spewing out some whitespace
2016-01-27 14:06:48 -08:00
e898b6e8bd
Update history to reflect merge of #4403 [ci skip]
2016-01-27 11:01:26 -08:00
6cd393c8ef
Merge pull request #4403 from jekyll/page.dir-must-have-slash
...
Merge pull request 4403
2016-01-27 11:01:25 -08:00
b1868983c7
Add test for Page#dir in :date/nil modes
2016-01-27 08:44:59 -08:00
9daebe8dd2
Use improved Page#dir
2016-01-27 08:32:36 -08:00
b70ee10198
Add benchmarks for Page#dir
2016-01-27 08:28:41 -08:00
aad54c9a87
Add Utils.merged_file_read_opts to unify reading & strip the BOM
2016-01-26 17:08:54 -08:00
38b64faeb2
Page#dir: ensure it ends in a slash
2016-01-26 16:44:30 -08:00
ce77fe6488
Update history.markdown to reflect the merger of #4402
2016-01-26 06:55:55 -06:00
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
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
74fb4aca16
Update history to reflect merge of #4401 [ci skip]
2016-01-25 15:49:23 -08:00
Parker Moore
jekyllbot
jekyllbot
Jordon Bedwell
Pat Hawks
Daniel Schildt
Chris
Michael Lee
toshi
Suriyaa Kudo
Kroum Tzanev
chrisfinazzo
Alfred Xing
David Celis