Commit Graph

4704 Commits

Author SHA1 Message Date
Parker Moore 7aa43f37fb Update history to reflect merging of #2948
Closes #2948

See 10c8184942af0c9c548390da2a4fab2089475797 for more
2014-10-04 19:56:18 -07:00
Ruslan Korolev 2a83bdccd5 jekyll build/serve -V option to docs 2014-10-04 19:55:22 -07:00
Parker Moore 97ed8622c7 Update history to reflect merge of #2964 [ci skip] 2014-10-04 19:52:57 -07:00
Parker Moore 7a2f7a569b Merge pull request #2964 from nternetinspired/meta-description 2014-10-04 19:51:32 -07:00
Parker Moore aed5554a1b Update history to reflect merge of #2967 [ci skip] 2014-10-04 19:48:12 -07:00
Parker Moore 961a3504ba Merge pull request #2967 from tmthrgd/master 2014-10-04 19:47:39 -07:00
Parker Moore 592cee9596 Update history to reflect merge of #2969 [ci skip] 2014-10-03 10:27:32 -07:00
tmthrgd 7869586e43 Add my ditaa-ditaa plugin under Other
ditaa-ditaa is a drastic revision of jekyll-ditaa that renders diagrams drawn using ASCII art into PNG images.

It is not immediately clear where ditaa-ditaa would belong as it provides both generator functionality, tag functionality and other functionality.
2014-10-03 01:34:30 +09:30
Seth Warburton 42a8dba642 Page specific descriptions 2014-09-30 22:17:49 +01:00
Parker Moore 98b5ff0d17 Update history to reflect merge of #2959 [ci skip] 2014-09-28 20:40:33 -07:00
Parker Moore dd25ca30d4 Update history to reflect merge of #2949 [ci skip] 2014-09-27 11:31:25 -07:00
Parker Moore d57d248152 Merge pull request #2949 from rusikf/patch-10 2014-09-27 11:30:29 -07:00
Parker Moore 314f476d11 Update history to reflect merge of #2953 [ci skip] 2014-09-27 11:29:51 -07:00
Parker Moore 0e6dc41db5 Merge pull request #2953 from vasinov/master 2014-09-27 11:29:20 -07:00
Parker Moore 1b923fb504 Update history to reflect merge of #2954 [ci skip] 2014-09-27 11:29:04 -07:00
Parker Moore 7539e2109b Merge pull request #2954 from chrisfinazzo/remove-explicit-serve-from-docs 2014-09-27 11:28:31 -07:00
chrisfinazzo 4a5f70b315 Clarify instructions 2014-09-27 13:06:45 -04:00
chrisfinazzo bec32b14cb Add a note about the separate commands, show an example without the watcher 2014-09-27 12:54:47 -04:00
Parker Moore a041d50681 Update history to reflect merge of #2957 [ci skip] 2014-09-26 17:09:16 -07:00
Parker Moore 0553dc2f85 Merge pull request #2957 from walpurgisriot/master 2014-09-26 17:08:42 -07:00
feivel 0701fa7b16 Update outdated comment
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
chrisfinazzo f80d82cfcc Remove references to the watch command in the sample 2014-09-26 12:46:41 -04:00
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