Commit Graph

8860 Commits

Author SHA1 Message Date
jekyllbot
e5317ced15 Merge pull request #5961 from ashmaroli/cucumber-win-fix
Merge pull request 5961
2017-03-27 15:39:18 -04:00
jekyllbot
7affec2347 Update history to reflect merge of #5983 [ci skip] 2017-03-27 15:38:37 -04:00
jekyllbot
99f5925cd3 Merge pull request #5983 from DirtyF/ruby-2.1
Merge pull request 5983
2017-03-27 15:38:36 -04:00
Frank Taillandier
a2e82b7264 mention Ruby > 2.1.0 in docs 2017-03-27 20:47:55 +02:00
Parker Moore
b367314424 Fix whitespace issue in philosophy document.
/cc https://github.com/jekyll/jekyll/issues/5342#issuecomment-247358296
2017-03-27 13:38:09 -04:00
Parker Moore
a6518c1de3 Update history to reflect merge of #5792 [ci skip] 2017-03-27 13:08:00 -04:00
Parker Moore
b91da2c904 Merge pull request #5792 from jekyll/philosophy
Document Jekyll's Philosophy
2017-03-27 13:04:03 -04:00
Parker Moore
f2bf984160 Update philosophy document based on benbalter's feedback. 2017-03-27 13:03:42 -04:00
jekyllbot
a9830fadac Update history to reflect merge of #5952 [ci skip] 2017-03-25 06:16:03 -04:00
jekyllbot
1f00d89e20 Merge pull request #5952 from tomjohnson1492/patch-19
Merge pull request 5952
2017-03-25 06:16:02 -04:00
Pat Hawks
01c95e85dd Merge branch 'master' into patch-19 2017-03-24 17:27:01 -05:00
jekyllbot
a3aed14d41 Update history to reflect merge of #5978 [ci skip] 2017-03-24 17:14:20 -04:00
jekyllbot
a2a6cc0c6a Merge pull request #5978 from jekyll/custom-404-tuts
Merge pull request 5978
2017-03-24 17:14:19 -04:00
jekyllbot
990809ba07 Update history to reflect merge of #5946 [ci skip] 2017-03-24 16:21:38 -04:00
jekyllbot
220335cef7 Merge pull request #5946 from ashmaroli/custom-404-tuts
Merge pull request 5946
2017-03-24 16:21:37 -04:00
Frank Taillandier
3142f31a7a add custom 404 to tutorial navigation 2017-03-24 21:19:54 +01:00
Ashwin Maroli
58dce4f099 Check for given content in posts 2017-03-23 10:10:38 +05:30
jekyllbot
16e807a41d Update history to reflect merge of #5965 [ci skip] 2017-03-22 11:28:40 -04:00
jekyllbot
cba13d4026 Merge pull request #5965 from Kivlov84/patch-2
Merge pull request 5965
2017-03-22 11:28:39 -04:00
jekyllbot
c48f147192 Update history to reflect merge of #5962 [ci skip] 2017-03-22 10:02:05 -04:00
jekyllbot
af0051f19f Merge pull request #5962 from Kivlov84/patch-1
Merge pull request 5962
2017-03-22 10:02:03 -04:00
Aleksander Kuś
b60b78cfc4 changed link references to names 2017-03-22 13:55:56 +01:00
jekyllbot
c55cc1d9ef Update history to reflect merge of #5971 [ci skip] 2017-03-21 15:34:57 -04:00
jekyllbot
2c4eebc2ae Merge pull request #5971 from tomjohnson1492/patch-21
Merge pull request 5971
2017-03-21 15:34:55 -04:00
Tom Johnson
fe6d4c7bea updates from parkr's review
- removed "actually"
- switched code example to use `where`
2017-03-21 10:27:05 -07:00
jekyllbot
161902eda2 Update history to reflect merge of #5949 [ci skip] 2017-03-21 12:26:06 -04:00
jekyllbot
061aa40e9f Merge pull request #5949 from lukebro/patch-1
Merge pull request 5949
2017-03-21 12:26:05 -04:00
Tom Johnson
f9243c5ab1 Included more details about adding defaults to static files
Based on the functionality released in [3.4.2](http://jekyllrb.com/news/2017/03/09/jekyll-3-4-2-released/) re adding defaults to static files, I thought this page needed some more detail.
2017-03-21 08:52:33 -07:00
Parker Moore
351e3abd8e Merge pull request #5969 from jekyll/release-3.4.3
Release post for v3.4.3
2017-03-21 11:24:49 -04:00
Pat Hawks
ca9d6be061 Release post for v3.4.3 2017-03-21 09:58:02 -05:00
Parker Moore
eab83c3653 Update generated history for jekyllrb.com 2017-03-21 10:00:47 -04:00
Pat Hawks
9d66fc2292 Release 💎 3.4.3 2017-03-21 10:00:04 -04:00
Parker Moore
df0d3f20c4 Fix some errant entries in History.markdown. 2017-03-21 09:58:26 -04:00
jekyllbot
d592f5781a Update history to reflect merge of #5957 [ci skip] 2017-03-21 09:12:18 -04:00
jekyllbot
2907825f62 Merge pull request #5957 from jekyll/pull/escape_colon
Merge pull request 5957
2017-03-21 09:12:16 -04:00
Aleksander Kuś
086bf13a33 Update buddyworks.md
added article to `buddy.yml`
2017-03-21 10:49:48 +01:00
Aleksander Kuś
93f472d1eb Update buddyworks.md
added unique links + minor text changes
2017-03-21 09:34:43 +01:00
jekyllbot
428ff04b7f Update history to reflect merge of #5966 [ci skip] 2017-03-20 15:21:27 -04:00
jekyllbot
ac1369c22c Merge pull request #5966 from fulldecent/patch-1
Merge pull request 5966
2017-03-20 15:21:25 -04:00
William Entriken
f93453368a Prefer .yaml over .toml 2017-03-20 10:56:34 -04:00
Aleksander Kuś
ddc9931c20 added (buddyworks) to ci list
This can only be approved once https://github.com/jekyll/jekyll/pull/5962 has been merged.
2017-03-20 12:04:46 +01:00
Aleksander Kuś
9e55247dac fix in line 42 2017-03-20 11:59:25 +01:00
Aleksander Kuś
be7fc8a2c4 added extension + fixed line 15 2017-03-17 16:46:31 +01:00
Aleksander Kuś
336b488d70 Create buddyworks
Added description for configuring a Jekyll build using a free https://buddy.works project.
2017-03-17 16:18:52 +01:00
Ashwin Maroli
7b1841a78e Fix Appveyor with dst-aware cucumber steps 2017-03-17 17:40:03 +05:30
Pat Hawks
6bc9f71050 Rename test for clarity 2017-03-16 07:59:13 -05:00
Pat Hawks
ec5b45cd7c Allow colons in uri_escape filter
Fixes #5954
2017-03-16 07:54:13 -05:00
jekyllbot
0f0ac6f586 Update history to reflect merge of #5951 [ci skip] 2017-03-14 01:13:38 -04:00
jekyllbot
9e0971e867 Merge pull request #5951 from tomjohnson1492/patch-18
Merge pull request 5951
2017-03-14 01:13:36 -04:00
Tom Johnson
88ad56c9e0 Add link to order of interpretation tutorial in Tutorials nav
Added a link to the Order of interpretation tutorial into the Tutorials nav. This tutorial is published, just not linked.
2017-03-13 09:58:02 -07:00