db53213d16
Merge remote-tracking branch 'jekyll/master' into patch-1
2016-09-24 08:46:24 +08:00
9564782054
Update history to reflect merge of #5402 [ci skip]
2016-09-23 14:30:39 -07:00
aaa062b047
Merge pull request #5402 from ashmaroli/jekyll-new-assets
...
Merge pull request 5402
2016-09-23 14:30:39 -07:00
f277baa975
Update history to reflect merge of #5399 [ci skip]
2016-09-23 14:18:02 -07:00
8197e17495
Merge pull request #5399 from jekyll/relative_url_and_absolute_url
...
Merge pull request 5399
2016-09-23 14:18:01 -07:00
0dc15dba88
remove `css/` from new site scaffolding
...
css directory and its contents to be handled by theme's `assets/`
directory.
The directory removed here wil be added to minima gem.
2016-09-23 18:00:13 +05:30
fa96843555
URLFilters: Simplify ensure_leading_slash calls.
2016-09-22 20:58:26 -07:00
6571ea0c1a
Update history to reflect merge of #5338 [ci skip]
2016-09-22 20:50:48 -07:00
992be253a6
Merge pull request #5338 from ashmaroli/config-patch
...
Merge pull request 5338
2016-09-22 20:50:47 -07:00
081d7c016a
Update history to reflect merge of #5397 [ci skip]
2016-09-22 16:56:05 -07:00
2a02c798ac
Merge pull request #5397 from jekyll/add-jekyll-menus
...
Merge pull request 5397
2016-09-22 16:56:04 -07:00
eab6752f52
Consolidate ensure_leading_slash to 2 lines.
2016-09-22 14:40:20 -07:00
aa86651650
Add absolute_url and relative_url filters.
2016-09-22 14:16:00 -07:00
ae27db62eb
Add jekyll-menus to the list of plugins.
2016-09-22 09:51:37 -05:00
87c745573f
Update history to reflect merge of #5389 [ci skip]
2016-09-21 13:29:38 -07:00
25d4291d62
Merge pull request #5389 from ashmaroli/cucumber-with-access
...
Merge pull request 5389
2016-09-21 13:29:38 -07:00
588b3a6649
remove features dirs on windows with proper access
2016-09-21 22:42:01 +05:30
846ab94f43
Update history to reflect merge of #5375 [ci skip]
2016-09-20 17:05:49 -07:00
3a7cbadd82
Merge pull request #5375 from Nicop06/underscore_highlight
...
Merge pull request 5375
2016-09-20 17:05:49 -07:00
f3859384c0
Update history to reflect merge of #5376 [ci skip]
2016-09-20 17:04:58 -07:00
ee84a95a38
Merge pull request #5376 from jonblatho/master
...
Merge pull request 5376
2016-09-20 17:04:57 -07:00
9ae0a7023b
Move reference to #5380 .
2016-09-20 17:04:26 -07:00
1ac87eaae2
Update history to reflect merge of #5380 [ci skip]
2016-09-20 16:39:33 -07:00
cfe61771e0
Merge pull request #5380 from ethomson/coderay_deprecation
...
Merge pull request 5380
2016-09-20 16:39:33 -07:00
262be85c49
Update history to reflect merge of #5237 [ci skip]
2016-09-20 15:32:26 -07:00
504411e476
Merge pull request #5237 from ashmaroli/bundle2new
...
Merge pull request 5237
2016-09-20 15:32:25 -07:00
650a3c7932
Update history to reflect merge of #5369
2016-09-20 13:48:40 -07:00
ad0f329d1c
Merge pull request #5369 from MertcanGokgoz/patch-1
...
Merge pull request 5369
2016-09-20 13:44:51 -07:00
152fa877f6
Update history to reflect merge of #5364 [ci skip]
2016-09-20 13:40:11 -07:00
3a45bf7d26
Merge pull request #5364 from jekyll/themes-asset-folder
...
Merge pull request 5364
2016-09-20 13:40:11 -07:00
279f1516d2
Merge branch 'master' into themes-asset-folder
...
* master:
Update history to reflect merge of #5381 [ci skip]
Update history to reflect merge of #5383 [ci skip]
run features on windows
Appease Rubocop
Update history to reflect merge of #5372 [ci skip]
Add missing period to sentence in first paragraph.
2016-09-20 13:13:01 -07:00
29d8fee4ce
Add test to ensure that the /assets theme reader doesn't clobber preexisting site files.
2016-09-20 13:12:34 -07:00
950a37395f
Update history to reflect merge of #5381 [ci skip]
2016-09-20 13:10:49 -07:00
d8d42f6abc
Merge pull request #5381 from pathawks/pr/rubocop
...
Merge pull request 5381
2016-09-20 13:10:48 -07:00
92dbe313e9
Update history to reflect merge of #5383 [ci skip]
2016-09-20 09:26:40 -07:00
2eedf7d79c
Merge pull request #5383 from ashmaroli/ruby-cucumber
...
Merge pull request 5383
2016-09-20 09:26:39 -07:00
75d59911ae
run features on windows
2016-09-20 10:28:54 +05:30
b78827cecb
Add documentation for assets.
2016-09-19 13:57:36 -07:00
7309ecf8e1
Theme: for various path helpers, use strings. Symbols confuse people.
2016-09-19 13:47:51 -07:00
3bfdc00d14
Appease Rubocop
2016-09-19 13:15:02 -05:00
f2bfc832a0
Marking filename with backticks as suggested
2016-09-19 12:08:20 -05:00
054b23f69a
Only complain about `coderay` if it is actually in the config
...
Don't complain about the deprecated `kramdown.coderay` key when
`highlighter == "coderay"`, since that could have been set with the
legitimate `syntax_highlighter: coderay` setting. Instead, complain
only if the `kramdown.coderay` configuration setting is actually
present.
2016-09-19 11:38:05 -05:00
0b94cf3fa1
Allow underscore in highlighter language
2016-09-19 13:10:29 +02:00
1a11536a2c
Clarify documentation in README
...
This change is subtle, but may prove greatly useful to Jekyll newbies
2016-09-18 17:38:28 -05:00
74baeb889a
ThemeAssetsReader: fix tests so everything passes.
2016-09-18 15:04:15 -04:00
7a9427ccec
Update history to reflect merge of #5372 [ci skip]
2016-09-18 10:54:26 -07:00
5a1c5311f3
Merge pull request #5372 from kyleobrien/patch-1
...
Merge pull request 5372
2016-09-18 10:54:26 -07:00
9aea71137e
Add missing period to sentence in first paragraph.
...
Added a period to the end of the last sentence in the first paragraph, which was missing.
2016-09-18 09:51:33 -04:00
5a932c90b5
added jekyll-spotify plugin
2016-09-18 10:50:21 +03:00
6d7f305e7c
Add tests for assets directory support.
2016-09-16 16:04:35 -07:00
Heng Kwokfu
jekyllbot
jekyllbot
Ashwin Maroli
Parker Moore
Jordon Bedwell
Pat Hawks
Jonathan Thornton
Edward Thomson
Nicolas Porcel
Kyle O'Brien
Mertcan GÖKGÖZ