dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,888 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

3888 Commits

Author SHA1 Message Date
Parker Moore a2169bf0c4 Have separate methods for all docs and just the docs that are being written. 2014-05-04 21:19:09 -04:00
Ben Balter a0bbf7703b make template site easier to customize 2014-05-04 21:07:23 -04:00
Parker Moore 693d1b84a8 Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Change Gemnasium extension
  Change Fury extension
  Change Travis extension
 2014-05-04 21:05:22 -04:00
Parker Moore e04e11c84d Swap env of maruku and kramdown dependencies. 
Maruku is now sunsetted, i.e. a dev dep, not a runtime dep.
Kramdown is now the default, i.e. a runtime dep, not a dev dep.
Closes #2285.
 2014-05-04 21:05:14 -04:00
Parker Moore 7360f90e5e Merge pull request #2288 from penibelst/badges-svg 
SVG Badges
 2014-05-04 20:32:57 -04:00
TheTomThorogood 94ccd42c73 Add short_year description to /docs/permalinks/ 2014-05-05 00:12:51 +09:30
TheTomThorogood f2849ac269 Add :short_year to url_placeholders 2014-05-05 00:12:07 +09:30
Parker Moore 8cad40a124 Update history to reflect merge of #2289 [ci skip] 2014-05-03 18:54:09 -04:00
Parker Moore 3af22f12bf Set content-type to text/html with utf-8 charset. 
Fixes #2289
 2014-05-03 18:51:55 -04:00
Parker Moore adfd9091f8 Update history to reflect merge of #2292 [ci skip] 2014-05-03 18:27:00 -04:00
Parker Moore 9cd648a262 Merge pull request #2292 from mtcomscxstart/code-class-fix 2014-05-03 18:26:43 -04:00
Parker Moore c0fa8702af Update history to reflect merge of #2290 [ci skip] 2014-05-03 18:21:04 -04:00
Parker Moore 98f9902839 Merge pull request #2290 from penibelst/travis-workaround 2014-05-03 18:15:08 -04:00
Anatol Broder c48da38b14 Switch 2.1 to 2.1.1 2014-05-03 21:31:00 +02:00
Valery Tolstov cf4304ab2b Update tests 
Remove language literal from class in test/test_redcarpet.rb
 2014-05-03 21:46:16 +04:00
Parker Moore c3e858443f Update history to reflect merge of #2291 [ci skip] 2014-05-03 12:55:14 -04:00
Parker Moore 3d948a3624 Merge pull request #2291 from chezou/fix-typo-in-docs 2014-05-03 12:54:15 -04:00
Valery Tolstov 4ae8fefb95 Remove literal lang name from class, fix #2284 
If code language is C classes for comment and language are the same
 2014-05-03 20:23:28 +04:00
Chezou c17bdf951d Fix typo in documentation 2014-05-03 22:42:50 +09:00
Anatol Broder eade742b32 Switch to 2.1 2014-05-03 09:49:13 +02:00
Anatol Broder e4b4b6e103 Change Gemnasium extension 2014-05-03 00:26:33 +02:00
Anatol Broder ddda89c33e Change Fury extension 2014-05-03 00:25:34 +02:00
Anatol Broder 11dcdf4fef Change Travis extension 2014-05-03 00:23:50 +02:00
Parker Moore bae479972f Add document.output to list of liquid vars in output. 
CLoses #2232.
 2014-05-02 11:24:18 -04:00
XhmikosR 346820d626 Simplify selectors. 2014-05-02 09:15:03 +03:00
XhmikosR 10f85eb856 Add missing vendor prefixed properties. 2014-05-02 09:15:03 +03:00
XhmikosR 63b45a993d Add fallback colors. 2014-05-02 09:15:03 +03:00
XhmikosR 0463399389 Remove duplicate properties. 2014-05-02 09:15:02 +03:00
XhmikosR ecdeea22eb Remove units from zero. 2014-05-02 09:15:02 +03:00
XhmikosR 7fdcc1af18 Be explicit with the `background` property. 2014-05-02 09:15:02 +03:00
XhmikosR 5e85163b57 Use the shorthand font property when possible. 
Conflicts:
	site/_includes/css/style.css
 2014-05-02 09:15:01 +03:00
XhmikosR a884a8a880 Move vendor prefixed properties before the unprefixed ones. 2014-05-02 09:15:01 +03:00
Parker Moore 267b8a037f Add an 'unreleased' note above Front-matter defaults. 
Fixes #2280.
 2014-04-30 17:23:12 -04:00
Parker Moore bf924a7664 Update history to reflect merge of #2277 [ci skip] 2014-04-29 23:59:48 -04:00
Parker Moore 359d9ea439 Merge pull request #2277 from troyswanson/jekyll-help-relocation 2014-04-29 23:59:22 -04:00
Troy Swanson 76f71b6b37 Update URL for jekyll-help repo 2014-04-29 21:57:57 -05:00
Parker Moore 1b1e85c0b8 Update history to reflect merge of #2273 [ci skip] 2014-04-28 12:42:20 -04:00
Parker Moore 6be3084eac Merge pull request #2273 from jpiasetz/copy-rails-functions 2014-04-28 12:41:31 -04:00
John Piasetzki 3e6a6ffb52 Update util functions 
Cribbed from http://api.rubyonrails.org/classes/Hash.html#method-i-symbolize_keys
 2014-04-28 02:06:41 -04:00
Parker Moore b5b55c90de Update history to reflect merge of #2154 [ci skip] 2014-04-28 00:02:15 -04:00
Parker Moore c546269485 Merge pull request #2154 from jpiasetz/refactor-highlighter 2014-04-28 00:01:50 -04:00
John Piasetzki cf81331b39 Revert back to an intialize more similar to the original 2014-04-27 23:21:00 -04:00
John Piasetzki 446ca8f73d Context is not used within any of the renders so no need to pass it 2014-04-27 23:21:00 -04:00
John Piasetzki d6bd735aff Refactor highlighting 
Extract some of the common logic from the renderers.
 2014-04-27 23:20:00 -04:00
Parker Moore 494dd97775 Update history to reflect merge of #2269 [ci skip] 2014-04-27 19:16:04 -04:00
Parker Moore 49dd67432d Merge pull request #2269 from jekyll/fix-up-serve 2014-04-27 19:15:33 -04:00
Parker Moore 4a40187f8e Update jekyll-sass-converter to the latest RC 
To see a detailed history of the changes, please visit https://github.com/jekyll/jekyll-sass-converter/compare/v1.0.0.rc3...v1.0.0.rc4

Notable change is that you can now set the style of the outputted Sass.
Ref: https://github.com/jekyll/jekyll-sass-converter/issues/3
 2014-04-27 19:15:02 -04:00
Parker Moore 513e77635b Refactor 'jekyll serve' command. 2014-04-27 19:02:33 -04:00
Parker Moore 619772b5c8 Update history to reflect merge of #2264 [ci skip] 2014-04-27 15:59:40 -04:00
Parker Moore bac4075128 Collections' "written" attribute has been changed to "output". 
This is a follow-up to 068d921ef6.
 2014-04-27 15:56:02 -04:00