Commit Graph

4782 Commits

Author SHA1 Message Date
Vasily Vasinov aaf813902a Update README.markdown
Someone added Jekyll to Hakiri for monitoring gems' security. I'm adding a security shield to README.markdown in this commit.
2014-09-26 08:45:12 -06:00
Parker Moore e3c74d5365 Update history to reflect merge of #2921 [ci skip] 2014-09-24 23:46:10 -07:00
Parker Moore 1f2250e7a4 Merge pull request #2921 from alfredxing/post-dest 2014-09-24 23:45:44 -07:00
Ruslan Korolev 6dbe112f79 Merge remote-tracking branch 'upstream/master' into patch-10 2014-09-25 10:40:10 +04:00
Alfred Xing ccef84a803 Update Cucumber tests to match new permalink parsing 2014-09-24 22:08:25 -07:00
Alfred Xing 3a96d01e4a Make permalink parsing consistent with pages
Require permalink to end in a slash to write an index file.
Addresses #2920.
2014-09-24 22:08:25 -07:00
Parker Moore 95644a844f Update history to reflect merge of #2925 [ci skip] 2014-09-24 17:08:21 -07:00
Parker Moore bd0eebdb05 Merge pull request #2925 from pathawks/htm-extension 2014-09-24 17:08:02 -07:00
Parker Moore 3319c0ab56 Update history to reflect merge of #2946 [ci skip] 2014-09-24 17:07:10 -07:00
Parker Moore dc0add15af Merge pull request #2946 from kleinfreund/patch-1 2014-09-24 17:06:53 -07:00
Parker Moore 6f585e5da5 Update history to reflect merge of #2951 [ci skip] 2014-09-24 17:06:30 -07:00
Parker Moore 0c32f389bc Merge pull request #2951 from jekyll/fix-rouge 2014-09-24 17:06:00 -07:00
Parker Moore 8990d7199e Latest version of Rouge so we know the API is right. 2014-09-22 23:04:51 -07:00
Parker Moore e6f89074d4 Rouge's Redcarpet plugin now has a different API
See for more:
- 18ec938e9c
- https://github.com/jneen/rouge/issues/182
2014-09-22 23:03:49 -07:00
Parker Moore 633c9be95c Update history to reflect merge of #2939 [ci skip] 2014-09-22 22:53:46 -07:00
Parker Moore 14c58213c7 Merge pull request #2939 from jekyll/ghp-gem 2014-09-22 22:53:25 -07:00
Parker Moore f2689ddf8f Merge branch 'ghp-gem' of github.com:jekyll/jekyll into ghp-gem
* 'ghp-gem' of github.com:jekyll/jekyll:
  Move it down a little
2014-09-22 22:52:36 -07:00
Parker Moore a5a8be97de Make it a little nicer. 2014-09-22 22:52:23 -07:00
Ruslan Korolev 1a88178fbf jekyll serve --skip-initial-build to docs 2014-09-22 19:16:23 +04:00
Philipp Rudloff e013c16ba9 Fix code example for media query mixin
It was using an old variable name (`$palm`) instead of the current one (`$on-paln`).
2014-09-22 08:18:14 +02:00
Parker Moore 52c76b5d93 Update history to reflect merge of #2906 [ci skip] 2014-09-21 13:37:18 -07:00
Parker Moore e68a584a27 Merge pull request #2906 from pathawks/escape-css-characters 2014-09-21 13:36:57 -07:00
Parker Moore bc9699e420 Update history to reflect merge of #2943 [ci skip] 2014-09-21 13:34:11 -07:00
Parker Moore 951fa8981f Merge pull request #2943 from rusikf/patch-7 2014-09-21 13:32:58 -07:00
Ruslan Korolev 6a06a627f8 jekyll build/serve --force_polling option to docs 2014-09-21 14:52:19 +04:00
Parker Moore a7eeeda99f Move it down a little 2014-09-19 19:58:45 -07:00
Parker Moore 0f008c02d8 Add note about using the github-pages gem properly 2014-09-19 19:56:36 -07:00
Parker Moore 3086ea3036 Update history to reflect merge of #2937 [ci skip] 2014-09-19 00:32:54 -07:00
Parker Moore 2efe14d656 Merge pull request #2937 from tmthrgd/patch-1 2014-09-19 00:32:29 -07:00
Tom Thorogood c03dadbe2c Include my mathml.rb plugin under Tags.
mathml.rb is a plugin to convert TeX mathematics into MathML.
2014-09-19 14:29:48 +09:30
Parker Moore 9efb68f957 Update history to reflect merge of #2922 [ci skip] 2014-09-17 12:22:56 -07:00
Parker Moore 2c9f6b0bd5 Merge pull request #2922 from igas/patch-1 2014-09-17 12:22:16 -07:00
Parker Moore 84ce5c3589 Update history to reflect merge of #2911 [ci skip] 2014-09-17 12:18:32 -07:00
Parker Moore bfe83cdec2 Merge pull request #2911 from charlesbaynham/minor-grammatical-error 2014-09-17 12:17:47 -07:00
Parker Moore 51ebd69162 Update history to reflect merge of #2931 [ci skip] 2014-09-16 16:36:06 -07:00
Parker Moore c11edf5272 Merge pull request #2931 from snrbrnjna/master 2014-09-16 16:35:16 -07:00
snrbrnjna a3f8336571 Jekyll Http Basic Auth Plugin added 2014-09-17 00:09:29 +02:00
Parker Moore 36baf435b5 Put #2929 History entry in the right place.
Not enough  yet today. 💤
2014-09-16 09:47:24 -07:00
Parker Moore 1416e0e0ce Update history to reflect merge of #2929 [ci skip] 2014-09-16 09:46:49 -07:00
Parker Moore c789a93bc8 Merge pull request #2929 from rusikf/patch-5 2014-09-16 09:46:14 -07:00
Ruslan Korolev 121a06a9eb unit test for jekyll new --force 2014-09-16 16:42:33 +04:00
Parker Moore 24d13fcc55 Update history to reflect merge of #2887 [ci skip] 2014-09-14 14:54:38 -07:00
Parker Moore bf1a2320e2 Merge pull request #2887 from pathawks/Update-Liquid-Links 2014-09-14 14:54:17 -07:00
Pat Hawks fdf58c5ce2 Allow per post permalinks to end in `.htm`
Fixes #2920
2014-09-14 11:58:16 -07:00
Pat Hawks 5445a1bead Add test for Use per-post permalinks ending in .htm 2014-09-14 11:36:26 -07:00
Igor Kapkov 566eb6ef3b remove watch since it default in 2.4.0 2014-09-14 11:28:29 +08:00
Parker Moore 19b2d2eeb6 Update history to reflect merge of #2917 [ci skip] 2014-09-13 12:24:26 -07:00
Parker Moore c08a7f3fbd Merge pull request #2917 from nitoyon/fix-template-doc 2014-09-13 12:24:05 -07:00
Parker Moore a0d46942b9 Update history to reflect merge of #2919 [ci skip] 2014-09-13 12:23:10 -07:00
Parker Moore 7cf64b6ab5 Merge pull request #2919 from bcomnes/singular-docs 2014-09-13 12:22:16 -07:00