github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-29 08:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,395 Commits 60 Branches 160 Tags
2fc800ebd26dcbab97fddef0462b051b9945eebb
Commit Graph

8395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Wojniak
2fc800ebd2 Use each instead of map to actually return nothing 2016-12-18 17:32:19 -08:00
jekyllbot
53db36c43a Update history to reflect merge of #5666 [ci skip] 2016-12-18 02:02:42 -08:00
jekyllbot
7231088e5c Merge pull request #5666 from DirtyF/rubocop-jekyll 
Merge pull request 5666
 2016-12-18 02:02:41 -08:00
Frank Taillandier
48f7a155c3 reindent attributes 2016-12-18 08:55:05 +01:00
Frank Taillandier
d134afcd4a ran rubocop -a 2016-12-18 07:22:36 +01:00
Frank Taillandier
de56b977b6 ran rubocop -a 
#5665
 2016-12-18 07:22:11 +01:00
jekyllbot
38a50e49de Update history to reflect merge of #5655 [ci skip] 2016-12-17 21:59:26 -08:00
jekyllbot
e21d35a474 Merge pull request #5655 from ashmaroli/fontawesome-docs 
Merge pull request 5655
 2016-12-17 21:59:25 -08:00
Ashwin Maroli
109dceee3d move changes to /.github/ and regenerate site 2016-12-18 07:45:08 +05:30
jekyllbot
25f58fe8f8 Update history to reflect merge of #5658 [ci skip] 2016-12-13 23:47:28 -08:00
jekyllbot
f560a4e226 Merge pull request #5658 from idmit/patch-1 
Merge pull request 5658
 2016-12-13 23:47:27 -08:00
Ivan Dmitrievsky
96fee68da4 Fix a couple of typos in the docs 2016-12-14 02:11:49 +03:00
jekyllbot
2856fd3ac7 Update history to reflect merge of #5657 [ci skip] 2016-12-13 05:42:17 -08:00
jekyllbot
fa32e14e7f Merge pull request #5657 from Kraymer/patch-1 
Merge pull request 5657
 2016-12-13 05:42:16 -08:00
Fabrice Laporte
86d45a5989 Update variables.md 
Fix typo 'page' => 'layout'
 2016-12-13 11:14:16 +01:00
Ashwin Maroli
8a89f033ad fix errors. 2016-12-11 19:52:22 +05:30
jekyllbot
4f0a7439aa Update history to reflect merge of #5653 [ci skip] 2016-12-11 03:49:39 -08:00
jekyllbot
360c82c95a Merge pull request #5653 from kimbaudi/patch-1 
Merge pull request 5653
 2016-12-11 03:49:39 -08:00
Ashwin Maroli
f5f387711a update documentation on updating FontAwesome Iconset 2016-12-11 15:35:46 +05:30
kimbaudi
b99013cc3d Improve Permalinks documentation. 
Add special note: built-in permalink styles are not recognized in the YAML Front Matter.
 2016-12-10 23:03:59 -08:00
jekyllbot
c09221205a Update history to reflect merge of #5652 [ci skip] 2016-12-10 12:17:00 -08:00
jekyllbot
b6b0fdc05b Merge pull request #5652 from jekyll/pull/assert_nil 
Merge pull request 5652
 2016-12-10 12:16:59 -08:00
Pat Hawks
69c4a8a1aa Use assert_nil instead of assert_equal nil 
Fixes #5648
 2016-12-10 11:31:04 -06:00
jekyllbot
b02f306f0a Update history to reflect merge of #5513 [ci skip] 2016-12-09 16:01:22 -08:00
jekyllbot
8ed324007a Merge pull request #5513 from thiagoarrais/5415-group_by_exp-filter 
Merge pull request 5513
 2016-12-09 16:01:21 -08:00
Thiago Arrais
d4c8d7fd2b Ignore symlinked file in windows 2016-12-09 13:15:16 -03:00
jekyllbot
43af0aa21b Update history to reflect merge of #5612 [ci skip] 2016-12-08 20:09:01 -08:00
jekyllbot
1049802499 Merge pull request #5612 from ashmaroli/win-tz 
Merge pull request 5612
 2016-12-08 20:09:01 -08:00
jekyllbot
81f6f1e404 Update history to reflect merge of #5643 [ci skip] 2016-12-08 04:14:43 -08:00
jekyllbot
5ba930bba8 Merge pull request #5643 from hugomd/master 
Merge pull request 5643
 2016-12-08 04:14:43 -08:00
Hugo
50bfdf181f Update Core team list in README 2016-12-08 23:08:43 +11:00
jekyllbot
4c6bbe7d0e Update history to reflect merge of #5641 [ci skip] 2016-12-07 23:25:42 -08:00
jekyllbot
d9288b5aa6 Merge pull request #5641 from daattali/patch-1 
Merge pull request 5641
 2016-12-07 23:25:41 -08:00
Dean Attali
f3300c1772 use backticks for Gemfile for consistency since in the next sentence _config.yml file has backtick 2016-12-07 19:45:19 -05:00
Ashwin Maroli
c6fe7ec57f add a set of steps in site_configuration.feature 
this set of steps allow the test to pass when DST in not currently active.
They may fail when DST becomes active.
 2016-12-06 22:19:07 +05:30
Ashwin Maroli
d70b4d0682 update documentation for Windows 2016-12-06 15:38:19 +05:30
Ashwin Maroli
f8456e02c1 narrow it down to only Windows 2016-12-06 15:38:18 +05:30
Ashwin Maroli
1b4ab418ba revert and adjust site_configuration.feature 2016-12-06 15:38:18 +05:30
Ashwin Maroli
31eeb1a561 add 'tzinfo-data' gem to generated Gemfile 2016-12-06 15:38:18 +05:30
Ashwin Maroli
ee5266602e add 'tzinfo-data' gem to Jekyll Gemfile 2016-12-06 15:38:18 +05:30
Ashwin Maroli
c4142c4c77 add a utility submodule to define 'TZ' on Windows 2016-12-06 15:38:18 +05:30
jekyllbot
4382b2467b Update history to reflect merge of #5632 [ci skip] 2016-12-05 06:45:16 -08:00
jekyllbot
ccbef6bd27 Merge pull request #5632 from arogachev/patch-1 
Merge pull request 5632
 2016-12-05 06:45:15 -08:00
Alexey Rogachev
8d4950d6e4 Fixed typo 2016-12-05 13:31:47 +06:00
Parker Moore
d219b9f6c5 Describe #5614 better. 2016-12-02 14:28:32 -08:00
jekyllbot
e38ec839a8 Update history to reflect merge of #5614 [ci skip] 2016-12-02 14:27:31 -08:00
jekyllbot
e87214c096 Merge pull request #5614 from XhmikosR/patch-1 
Merge pull request 5614
 2016-12-02 14:27:30 -08:00
XhmikosR
abf20bad30 Update _font-awesome.scss 
Move .woff file before .ttf so that it's preferred by supported browsers.
 2016-12-01 11:57:10 +02:00
Thiago Arrais
91f0b91d6a Rename for more idiomatic Ruby 2016-11-30 18:16:25 -03:00
Thiago Arrais
4ed41558d1 Whoops! 2016-11-30 17:54:59 -03:00