Commit Graph

6779 Commits

Author SHA1 Message Date
Carlos Garcés 53bb262fed Added details about permalinks problem
Small description about how Jekyll generated the files based on a permalink
2016-02-03 11:42:18 +01:00
Robert Martin 49e3180607 Update structure.md 2016-02-02 23:31:21 -05:00
jekyllbot 7df8f50248 Update history to reflect merge of #4455 [ci skip] 2016-02-02 16:59:25 -08:00
jekyllbot b0d6988c1d Merge pull request #4455 from daattali/patch-2
Merge pull request 4455
2016-02-02 16:59:24 -08:00
Dean Attali 75b55ff4f2 upgrade notes: mention trailing slash in permalink; fixes #4440 2016-02-02 16:16:12 -08:00
jekyllbot 7886fdb166 Update history to reflect merge of #4452 [ci skip] 2016-02-02 15:19:08 -08:00
jekyllbot 6e37d16907 Merge pull request #4452 from jekyll/set-linenumbers
Merge pull request 4452
2016-02-02 15:19:07 -08:00
Parker Moore 5058382d5a LiquidRenderer#parse: parse with line numbers. 2016-02-02 14:43:45 -08:00
jekyllbot bbefef20cd Update history to reflect merge of #4428 [ci skip] 2016-02-02 14:02:00 -08:00
jekyllbot 27535e2b3c Merge pull request #4428 from jekyll/bug/make-config-symbol-accessible
Merge pull request 4428
2016-02-02 14:01:59 -08:00
Jordon Bedwell 65a1fc4120 Mispell Rouge intentionally. 2016-02-02 12:27:17 -06:00
jekyllbot 7ae4973788 Update history to reflect merge of #4437 [ci skip] 2016-02-02 07:42:38 -08:00
jekyllbot a452d0cb29 Merge pull request #4437 from pathawks/rubocop.yml
Merge pull request 4437
2016-02-02 07:42:37 -08:00
jekyllbot b1b409433c Update history to reflect merge of #4436 [ci skip] 2016-02-02 07:41:16 -08:00
jekyllbot 7f6d29af5d Merge pull request #4436 from d2s/d2s-site-linkfix
Merge pull request 4436
2016-02-02 07:41:16 -08:00
Pat Hawks 198103ce7a
Include .rubocop.yml in Gem 2016-02-01 17:46:31 -08:00
Daniel Schildt 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
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
Jordon Bedwell 4d805e29bc Fix #4427: Make our @config hash symbol accessible. 2016-01-30 09:48:37 -06: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 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