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

4981 Commits

Author SHA1 Message Date
Parker Moore 0f669ba9b1 Update history to reflect merge of #3132 [ci skip] 2014-11-20 12:37:27 -08:00
Parker Moore a9a21e6572 Merge pull request #3132 from XhmikosR/gridism 2014-11-20 12:37:06 -08:00
Parker Moore 3b05b0d867 Update history to reflect merge of #3133 [ci skip] 2014-11-20 12:36:33 -08:00
Parker Moore b16d47a444 Merge pull request #3133 from XhmikosR/patch-11 2014-11-20 12:36:08 -08:00
XhmikosR d2d3087d3b Slightly compress jekyll-sticker.jpg. 2014-11-20 22:18:02 +02:00
XhmikosR b9a4cf0485 Update gridism. 2014-11-20 22:11:50 +02:00
Parker Moore 848e402937 Update history to reflect merge of #2904 [ci skip] 2014-11-20 10:36:10 -08:00
Parker Moore c0951b0a19 Merge pull request #2904 from XhmikosR/mixins 2014-11-20 10:35:27 -08:00
Parker Moore 3592284969 Update history to reflect merge of #3127 [ci skip] 2014-11-18 12:50:28 -08:00
Parker Moore 0f458edf2b Merge pull request #3127 from aarongustafson/master 2014-11-18 12:50:07 -08:00
Aaron Gustafson 1adf8974bf Adding Webmentions in the right place this time :-) 2014-11-18 15:06:24 -05:00
XhmikosR da443039e1 Move custom code from _font-awesome.scss to _style.scss. 
Also change the order of includes so that _style.scss is last for precedence reasons.
 2014-11-18 08:15:53 +02:00
XhmikosR 4aee950418 Add Sass mixins and use them. 
Reduces code duplication and makes things cleaner.
 2014-11-18 08:15:53 +02:00
Parker Moore 9e454d24a0 Update history to reflect merge of #3123 [ci skip] 2014-11-17 13:06:29 -08:00
Parker Moore 5185c8d72b Merge pull request #3123 from jekyll/site-sass-improvements 2014-11-17 13:05:57 -08:00
Joel Glovier 6f9d28f398 use sass selector nesting in pygments 2014-11-17 14:55:32 -05:00
Joel Glovier 2195e5e469 use sass selector nesting for styles 2014-11-17 14:48:34 -05:00
Parker Moore 60202782ea Only try bundler if the Gemfile is there. 2014-11-16 21:21:50 -08:00
Parker Moore 32b14d6402 First, setup Bundler. Then, require it. 
Per a conversation in
https://github.com/bundler/bundler/issues/3252#issuecomment-63208769
 2014-11-16 21:18:23 -08:00
Parker Moore 22275e571d Add note about page vs post. [ci skip] 
Closes #3056.
 2014-11-16 20:40:23 -08:00
Parker Moore 4142630614 Use the text lexer instead of the non-existant CSV one. [ci skip] 
Ref #3101.
 2014-11-16 20:29:17 -08:00
Parker Moore 3d8368fa4f Update history to reflect merge of #3058 [ci skip] 2014-11-16 20:21:09 -08:00
Parker Moore 687b9cdf19 Merge pull request #3058 from alfredxing/fix-post-url-equality 2014-11-16 20:19:37 -08:00
Parker Moore ecca3accdc Update history to reflect merge of #3094 [ci skip] 2014-11-16 20:17:27 -08:00
Parker Moore 5aa747e99a Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Get rid of noifniof
 2014-11-16 20:16:48 -08:00
Parker Moore b5a32a6d46 Merge pull request #3094 from alfredxing/no-noifniof 2014-11-16 20:16:45 -08:00
Parker Moore 426f2a79fc Update history to reflect merge of #3091 [ci skip] 2014-11-16 20:15:13 -08:00
Parker Moore d9cdc7992a Merge pull request #3091 from rovrov/master 2014-11-16 20:14:50 -08:00
Matt Rogers 829133cf98 Update history to reflect merge of #3101 [ci skip] 2014-11-13 21:34:48 -06:00
Matt Rogers 27362a1984 Merge pull request #3101 from ndarville/patch-1 2014-11-13 21:34:31 -06:00
Niclas Darville 3014fbd344 Added CSV example for data-file docs 2014-11-13 16:04:28 +01:00
Niclas Darville 596b9e0785 Mentioned CSV extension in docs for data files 
Since CSV files are supported as collections.
 2014-11-13 10:30:00 +01:00
Parker Moore 39c9fb120f Update history to reflect merge of #3089 [ci skip] 2014-11-12 18:47:03 -08:00
Parker Moore 314fb875b5 Merge pull request #3089 from jekyll/remove-duplication-in-regexp 2014-11-12 18:46:44 -08:00
Parker Moore 3b40d964fb Update history to reflect merge of #3093 [ci skip] 2014-11-11 18:22:37 -08:00
Parker Moore a48379a715 Merge pull request #3093 from shinnn/ga 2014-11-11 18:22:14 -08:00
Alfred Xing d4c15efff9 Cache name matching regex 2014-11-11 17:35:09 -08:00
Alfred Xing 2a41945014 Get rid of noifniof 2014-11-11 15:14:24 -08:00
Shinnosuke Watanabe dc248345a9 Change variables of Google Analytics script 
`i` `s` `o` `g` `r` `a` `m` -> `j` `e` `k` `y` `l` `L`

Generated by isogram
https://github.com/shinnn/isogram
 2014-11-11 18:42:54 +09:00
rovrov b6f3adb6e3 Add trailing slash to paginate_path example. 
https://github.com/jekyll/jekyll-paginate/issues/15#issuecomment-62322554
 2014-11-10 16:02:52 -05:00
Parker Moore 472c18e409 Update history to reflect merge of #3090 [ci skip] 2014-11-10 12:02:26 -08:00
Parker Moore e42f5ac2dc Merge pull request #3090 from alfredxing/fix-error-output 2014-11-10 12:01:46 -08:00
Alfred Xing 06750b8502 Print error message in renderer 2014-11-10 11:45:56 -08:00
Parker Moore bd907c5be6 Remove duplicate regexp phrase: ^\A. 
Addresses @mastahyeti's comment in #3077: https://github.com/jekyll/jekyll/pull/3077#discussion_r20077150
 2014-11-10 11:36:05 -08:00
Parker Moore c79fe1125c Update history to reflect merge of #3088 [ci skip] 2014-11-10 10:51:01 -08:00
Parker Moore 20f0940455 Merge pull request #3088 from alfredxing/fix-error-output 2014-11-10 10:50:32 -08:00
Alfred Xing 84cef2202d Remove duplicate 'Conversion error:' message 2014-11-10 09:12:51 -08:00
Alfred Xing eaa132c65b Fall back to old method with deprecation warning 2014-11-09 11:55:47 -08:00
Parker Moore 2d31d07602 Update site history page with v2.5.1 2014-11-09 10:39:18 -08:00
Parker Moore d99814baa5 v2.5.1 was released on Nov 9, not Nov 8. 2014-11-09 09:48:21 -08:00