baafe24e4a
Update history.markdown to reflect the merge of #3736
2015-09-01 13:54:24 -05:00
8ce4ff9060
Merge pull request #3736 from jekyll/jekyll-feed
...
Use Jekyll Feed for jekyllrb.com
2015-09-01 13:53:30 -05:00
47df90583a
Merge branch 'master' into jekyll-feed
2015-09-01 14:35:55 -04:00
11da2e0d90
Update history.markdown to reflect the merger of #3769
2015-09-01 13:27:18 -05:00
0340fea808
Merge pull request #3769 from chrisfinazzo/install-docs
...
Update install docs (Core dependencies, Windows reqs, etc)
2015-09-01 13:26:17 -05:00
fffb834e63
Update history.markdown to reflect the merger of #3158
2015-08-31 05:17:16 -05:00
87517af979
Merge pull request #3950 from nyufac/master
...
Jekyll views router plugin
2015-08-31 05:16:04 -05:00
d35f0a8e16
Merge pull request #3948 from julienbourdeau/julienbourdeau-patch-1
...
Just fixed markdown list in `site/README.md`
2015-08-30 12:55:43 -07:00
d18d1bc43b
Jekyll views router plugin
2015-08-30 21:10:27 +05:00
edcbe99b58
Update README.md
2015-08-30 15:48:02 +02:00
f2d31a1b20
Update history to reflect merge of #3935
...
[ci skip]
2015-08-25 23:39:40 -07:00
831eb17b29
Merge pull request #3935 from jekyll/filter-where-to_s
...
Merge pull request 3935
2015-08-25 23:39:19 -07:00
4169075dd1
filters: `where` should compare stringified versions of input & comparator
...
Non-string input was being missed as a result of poor comparison.
Converting inputs to strings ensure numerical and boolean values are
properly compared.
Fixes #3911 .
2015-08-25 23:00:58 -07:00
cd4829d28d
Update history to reflect merge of #3931
...
[ci skip]
2015-08-25 22:11:23 -07:00
75007cb26d
Merge pull request #3931 from dommmel/patch-1
...
Merge pull request 3931
2015-08-25 22:10:38 -07:00
47cb3a8fd7
docs: categories/tags only with array & comma-separated string
...
Fixed #3930
2015-08-24 18:01:06 -07:00
14a5646730
Update history to reflect merge of #3933
...
[ci skip]
2015-08-24 14:03:35 -07:00
7c5eae5ea2
Merge pull request #3933 from jekyll/vendor-mime-types
...
Merge pull request 3933
2015-08-24 14:02:59 -07:00
1eb1f4ea4d
add script to vendor mime types
2015-08-24 16:21:50 -04:00
12fc4c5ef4
update plugins.md
2015-08-24 14:13:03 +02:00
34afc7784d
Update history to reflect merge of #3871
...
[ci skip]
2015-08-23 12:55:20 -07:00
8927898e1f
Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change
...
Merge pull request 3871
2015-08-23 12:55:00 -07:00
753bdbefbf
Update history to reflect merge of #3925 [ci skip]
2015-08-21 10:36:39 -05:00
8c509bcf40
Merge pull request #3925 from jekyll/code-of-conduct
2015-08-21 10:36:36 -05:00
a446589cdc
Add a Code of Conduct.
...
Closes #3924 .
2015-08-20 10:17:37 -07:00
4c1427c400
docs: Update _data in "Directory structure"
...
Add in references to _data format and extension options of .csv, .json,
etc., consistent with _docs/datafiles.md
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2015-08-17 09:39:44 -07:00
1c767febe5
Merge pull request #3918 from gangsthub/patch-2
...
I think you made a typo there
2015-08-17 09:31:37 -07:00
47c9ed0829
I think you made a typo there
...
as seen on:
http://blog.davepoon.net/2015/01/19/setting-up-sass-with-jekyll/
http://markdotto.com/2014/09/25/sass-and-jekyll/#create-a-sass-stylesheet
2015-08-17 13:23:17 +02:00
010038e78a
Update history to reflect merge of #3782
...
[ci skip]
2015-08-16 13:32:18 -04:00
44a43b757d
Merge branch 'fniephaus-_includes' into 'master'
...
* fniephaus-_includes:
Unify renaming of configuration options to a single method. /cc #3782 .
Make _includes directory configurable; closes #2684
2015-08-16 13:30:45 -04:00
399606c544
Unify renaming of configuration options to a single method. /cc #3782 .
2015-08-16 13:30:39 -04:00
8b72f14217
Update history to reflect merge of #3892
...
[ci skip]
2015-08-16 13:17:24 -04:00
63a51df909
Fix up test for 'future' flag. /cc #3892
2015-08-16 13:15:47 -04:00
559cd6c7e7
Future should be set to false in the default config
2015-08-16 13:11:08 -04:00
2812341c37
Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
...
Conflicts:
bin/jekyll
2015-08-09 16:22:33 +01:00
ac56e9dd16
Make _includes directory configurable; closes #2684
...
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
af3fe0f30d
Update history.markdown to reflect the merger of #3897 .
2015-08-08 17:39:26 -05:00
571f75ee64
Merge pull request #3897 from vlajos/typofixes-vlajos-20150807
...
Typofixes
2015-08-08 17:38:12 -05:00
d652f6e337
typofix in test/test_regenerator.rb
2015-08-08 21:28:36 +01:00
aecfe4c160
typofix in site/_docs/plugins.md
2015-08-08 21:27:03 +01:00
7c8e24a488
Update history to reflect merge of #3895
...
[ci skip]
2015-08-05 14:31:48 -07:00
d1620db235
Merge pull request #3895 from jekyll/update-contrib
...
Merge pull request 3895
2015-08-05 14:31:13 -07:00
489b9c3639
update contributing documentation to reflect workflow updates
2015-08-05 14:30:35 -07:00
11230718a4
Update history to reflect merge of #3894
...
[ci skip]
2015-08-05 14:19:38 -07:00
7970abebf6
Merge pull request #3894 from nateberkopec/change-contributing-md
...
Merge pull request 3894
2015-08-05 14:17:59 -07:00
1f29e5b5dc
Contributing.md should refer to script/cucumber
2015-08-05 17:09:21 -04:00
44f0e5b14a
Update history to reflect merge of #3891
...
[ci skip]
2015-08-05 10:19:09 -07:00
d3c327e184
Further flesh out Continuous Integration guide
...
More information added after having some trouble getting Travis to execute with the existing explanation.
2015-08-05 10:16:22 -07:00
a849674f7d
Update history to reflect merge of #3820
...
[ci skip]
2015-08-04 16:16:15 -07:00
627af07c3e
Merge pull request #3820 from chrisfinazzo/configuration-docs
...
Merge pull request 3820
2015-08-04 16:15:59 -07:00
Jordon Bedwell
Ben Balter
Parker Moore
Neil Faccly
Julien Bourdeau
Dominik
Matt Rogers
jaybe@jekyll
BRAVO
Nate Berkopec
Fabio Niephaus
Veres Lajos
Johan Bové