Commit Graph

7472 Commits

Author SHA1 Message Date
Parker Moore
ddf833505c Fix offense. 2016-06-15 10:33:30 -07:00
jekyllbot
4a2b96293b Update history to reflect merge of #5009 [ci skip] 2016-06-15 10:04:37 -07:00
jekyllbot
713fbb6652 Merge pull request #5009 from nasht00/master
Merge pull request 5009
2016-06-15 10:04:37 -07:00
Nathan Hazout
d1f4d874be Added a scenario for #4414 2016-06-15 11:21:02 +03:00
jekyllbot
8d748ce45f Update history to reflect merge of #4917 [ci skip] 2016-06-14 14:03:06 -07:00
jekyllbot
fb1a459ddd Merge pull request #4917 from pathawks/pr/normalize_whitespace
Merge pull request 4917
2016-06-14 14:03:05 -07:00
jekyllbot
492cfcd962 Update history to reflect merge of #5012 [ci skip] 2016-06-14 14:02:05 -07:00
jekyllbot
cb0545dd46 Merge pull request #5012 from admhlt/update-liquid-links
Merge pull request 5012
2016-06-14 14:02:04 -07:00
Adam Hollett
8d65ce675a Update links to point to core Liquid site 2016-06-14 15:21:24 -04:00
jekyllbot
902ff4c132 Update history to reflect merge of #4993 [ci skip] 2016-06-14 11:23:58 -07:00
jekyllbot
9f1f70267f Merge pull request #4993 from ayastreb/filters
Merge pull request 4993
2016-06-14 11:23:58 -07:00
jekyllbot
15477d2417 Update history to reflect merge of #5010 [ci skip] 2016-06-14 09:55:36 -07:00
jekyllbot
d3c9b8d077 Merge pull request #5010 from rvernica/patch-1
Merge pull request 5010
2016-06-14 09:55:35 -07:00
Rares Vernica
6c279b173f Update text to be consitent with example 2016-06-14 09:45:51 -07:00
Nathan Hazout
3fe9e92c4f Prevent reset of page to fix #4414 2016-06-14 13:07:26 +03:00
jekyllbot
b5466196ea Update history to reflect merge of #5006 [ci skip] 2016-06-13 14:38:45 -07:00
jekyllbot
d8acc434ae Merge pull request #5006 from jbilinski/patch-1
Merge pull request 5006
2016-06-13 14:38:45 -07:00
Jamie Bilinski
959f19c086 Command needs to be called from blog path 2016-06-13 14:24:50 -07:00
jekyllbot
c2441ffbb4 Update history to reflect merge of #4908 [ci skip] 2016-06-13 14:23:41 -07:00
jekyllbot
eba9a2716b Merge pull request #4908 from jekyll/add-timing-cucumber
Merge pull request 4908
2016-06-13 14:23:41 -07:00
jekyllbot
176b347737 Update history to reflect merge of #5000 [ci skip] 2016-06-13 14:14:30 -07:00
jekyllbot
9e8f205009 Merge pull request #5000 from crispgm/master
Merge pull request 5000
2016-06-13 14:14:30 -07:00
jekyllbot
8b1c3bbf33 Update history to reflect merge of #5005 [ci skip] 2016-06-13 13:17:54 -07:00
jekyllbot
4c4327a14b Merge pull request #5005 from jekyll/doctor-run-generate
Merge pull request 5005
2016-06-13 13:17:53 -07:00
Parker Moore
e6dc78b22f Run Site#generate for 'jekyll doctor' to catch plugin issues. 2016-06-13 13:08:48 -07:00
David Zhang
6fd734f6ea Add jekyll-tags-list-plugin 2016-06-12 15:14:37 +08:00
Jordon Bedwell
dfc7d61765 Mac OS -> MacOS 2016-06-08 23:18:16 -05:00
Anatoliy Yastreb
5f2bb5d0aa rubocop: fix code style 2016-06-07 20:13:43 +03:00
jekyllbot
2f95517bfd Update history to reflect merge of #4989 [ci skip] 2016-06-06 09:59:05 -07:00
jekyllbot
59a04ab4cb Merge pull request #4989 from chrisfinazzo/normalize-css-v4
Merge pull request 4989
2016-06-06 09:59:05 -07:00
chrisfinazzo
732ca468fa Update normalize.css to v4.0.0. 2016-06-06 11:16:32 -04:00
jekyllbot
43fe09a07b Update history to reflect merge of #4973 [ci skip] 2016-06-06 08:03:37 -07:00
jekyllbot
7197028cd5 Merge pull request #4973 from ayastreb/site
Merge pull request 4973
2016-06-06 08:03:36 -07:00
jekyllbot
915b80b6b3 Update history to reflect merge of #4940 [ci skip] 2016-06-06 07:53:34 -07:00
jekyllbot
c8606c5765 Merge pull request #4940 from DirtyF/feature-rubocop
Merge pull request 4940
2016-06-06 07:53:33 -07:00
DirtyF
f41bd1bab7 Rubocop cleanup 2016-06-06 16:30:09 +02:00
Parker Moore
1f01c88fa0 templates docs: .category, .categories, and .tags only apply to posts. [ci skip]
Fixes #4987.
2016-06-05 16:02:05 -07:00
jekyllbot
688c7b1925 Update history to reflect merge of #4985 [ci skip] 2016-06-04 09:30:26 -07:00
jekyllbot
184da0ca2f Merge pull request #4985 from chrisfinazzo/fix-broken-link
Merge pull request 4985
2016-06-04 09:30:26 -07:00
chrisfinazzo
e0f2848da6 Link to the HTML page instead of Markdown 2016-06-04 12:26:21 -04:00
jekyllbot
652f1bad0b Update history to reflect merge of #4979 [ci skip] 2016-06-03 22:18:39 -07:00
jekyllbot
a5db408d5c Merge pull request #4979 from jekyll/percent_r
Merge pull request 4979
2016-06-03 22:18:38 -07:00
Parker Moore
f5a8000baa Fix regexp literal issues on master. 2016-06-03 22:10:15 -07:00
Parker Moore
8917fa8282 Merge branch 'master' into percent_r
* master: (22 commits)
  Update history to reflect merge of #4980 [ci skip]
  werdz
  Use jekyll-mentions and restructure
  Add post about GSoC project.
  Update history to reflect merge of #4976 [ci skip]
  Amend WEBrick default headers documentation
  Update history to reflect merge of #4966 [ci skip]
  .rubocop.yml - remove lib/jekyll.rb
  lib/jekyll.rb - fix offenses reported by rubocop method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
  Update history to reflect merge of #4977 [ci skip]
  Update history to reflect merge of #4962 [ci skip]
  Update history to reflect merge of #4959 [ci skip]
  Fixed typo
  Changed github-gem to github-pages
  Included installation instructions
  Installation instructions for github-pages gem
  Added link to windows doc page
  Fix inaccurate HTTP response header field name
  Minor tweak to fix missing apostrophne
  Feedback for flubbed regex and prefer File's directory check
  ...
2016-06-03 22:09:15 -07:00
jekyllbot
ea0b43f56d Update history to reflect merge of #4980 [ci skip] 2016-06-03 16:42:37 -07:00
jekyllbot
8308a06b02 Merge pull request #4980 from jekyll/gsoc-update
Merge pull request 4980
2016-06-03 16:42:36 -07:00
Parker Moore
b3583a4236 werdz 2016-06-03 16:41:35 -07:00
Parker Moore
03c2811ae0 Use jekyll-mentions and restructure 2016-06-03 14:58:51 -07:00
Parker Moore
912e6b469a Add post about GSoC project. 2016-06-03 13:47:35 -07:00
jekyllbot
b15423b6a9 Update history to reflect merge of #4976 [ci skip] 2016-06-03 08:12:06 -07:00