Parker Moore
650a3c7932
Update history to reflect merge of #5369
2016-09-20 13:48:40 -07:00
jekyllbot
ad0f329d1c
Merge pull request #5369 from MertcanGokgoz/patch-1
...
Merge pull request 5369
2016-09-20 13:44:51 -07:00
jekyllbot
152fa877f6
Update history to reflect merge of #5364 [ci skip]
2016-09-20 13:40:11 -07:00
jekyllbot
3a45bf7d26
Merge pull request #5364 from jekyll/themes-asset-folder
...
Merge pull request 5364
2016-09-20 13:40:11 -07:00
Parker Moore
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
Parker Moore
29d8fee4ce
Add test to ensure that the /assets theme reader doesn't clobber preexisting site files.
2016-09-20 13:12:34 -07:00
jekyllbot
950a37395f
Update history to reflect merge of #5381 [ci skip]
2016-09-20 13:10:49 -07:00
jekyllbot
d8d42f6abc
Merge pull request #5381 from pathawks/pr/rubocop
...
Merge pull request 5381
2016-09-20 13:10:48 -07:00
jekyllbot
92dbe313e9
Update history to reflect merge of #5383 [ci skip]
2016-09-20 09:26:40 -07:00
jekyllbot
2eedf7d79c
Merge pull request #5383 from ashmaroli/ruby-cucumber
...
Merge pull request 5383
2016-09-20 09:26:39 -07:00
Ashwin Maroli
75d59911ae
run features on windows
2016-09-20 10:28:54 +05:30
Parker Moore
b78827cecb
Add documentation for assets.
2016-09-19 13:57:36 -07:00
Parker Moore
7309ecf8e1
Theme: for various path helpers, use strings. Symbols confuse people.
2016-09-19 13:47:51 -07:00
Pat Hawks
3bfdc00d14
Appease Rubocop
2016-09-19 13:15:02 -05:00
Jonathan Thornton
f2bfc832a0
Marking filename with backticks as suggested
2016-09-19 12:08:20 -05:00
Edward Thomson
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
Nicolas Porcel
0b94cf3fa1
Allow underscore in highlighter language
2016-09-19 13:10:29 +02:00
Jonathan Thornton
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
Parker Moore
74baeb889a
ThemeAssetsReader: fix tests so everything passes.
2016-09-18 15:04:15 -04:00
jekyllbot
7a9427ccec
Update history to reflect merge of #5372 [ci skip]
2016-09-18 10:54:26 -07:00
jekyllbot
5a1c5311f3
Merge pull request #5372 from kyleobrien/patch-1
...
Merge pull request 5372
2016-09-18 10:54:26 -07:00
Kyle O'Brien
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
Mertcan GÖKGÖZ
5a932c90b5
added jekyll-spotify plugin
2016-09-18 10:50:21 +03:00
Parker Moore
6d7f305e7c
Add tests for assets directory support.
2016-09-16 16:04:35 -07:00
Parker Moore
cf26bf5db0
TestTheme: update tests for 'path_for' now that it's no longer prepending the underscore
2016-09-16 15:36:33 -07:00
Parker Moore
87b9cfe2b5
ThemeBuilder: add 'assets' to list of scaffold directories
2016-09-16 14:57:58 -07:00
Parker Moore
13aec48137
Add ThemeAssetsReader which reads assets from a theme
...
If the theme includes the 'assets' directory, it will be walked and items will be added to the site based
on the normal rules of Jekyll: if there is YAML front matter, it will be added as a (convertible) Page,
otherwise it will be added as a StaticFile.
2016-09-16 14:41:36 -07:00
Parker Moore
b8f17b9034
Exclude node_modules by default
...
If no 'exclude' directive is specified, exclude node_modules by default.
https://twitter.com/mxstbr/status/761856359579185153
2016-09-16 13:09:10 -07:00
jekyllbot
562ffe7a3f
Update history to reflect merge of #5361 [ci skip]
2016-09-16 12:58:42 -07:00
jekyllbot
c877d6f75c
Merge pull request #5361 from DirtyF/patch-1
...
Merge pull request 5361
2016-09-16 12:58:42 -07:00
Frank Taillandier
0233d93352
vendor is now excluded by default [ci-skip]
2016-09-16 18:25:06 +02:00
Frank Taillandier
59b61c3f9f
Exclude vendor by default
2016-09-16 07:56:37 +02:00
jekyllbot
57fd5f887d
Update history to reflect merge of #5199 [ci skip]
2016-09-13 07:11:51 -07:00
jekyllbot
4888b84b44
Merge pull request #5199 from jeffkole/adds-linking-to-all-files
...
Merge pull request 5199
2016-09-13 07:11:50 -07:00
Ashwin Maroli
345f043cc4
test bundle install and skipping it.
2016-09-13 08:52:54 +05:30
Ashwin Maroli
566b42b8b3
add `bundle install` to `jekyll new`
...
- automatically run `bundle install` from within the newly generated blog
directory by default.
- add a new switch to skip this default behaviour.
2016-09-13 08:43:13 +05:30
jekyllbot
55de780520
Update history to reflect merge of #5347 [ci skip]
2016-09-12 00:26:00 -07:00
jekyllbot
42725b1325
Merge pull request #5347 from vohedge/patch-1
...
Merge pull request 5347
2016-09-12 00:26:00 -07:00
vohedge
d86a293d78
Fix typo
2016-09-11 00:18:02 +09:00
jekyllbot
a2e911c1b5
Update history to reflect merge of #5326 [ci skip]
2016-09-09 13:53:28 -07:00
jekyllbot
3e0363be4a
Merge pull request #5326 from ashmaroli/gitignore-gem
...
Merge pull request 5326
2016-09-09 13:53:28 -07:00
jekyllbot
aa2cfc81b7
Update history to reflect merge of #5337 [ci skip]
2016-09-08 11:27:36 -07:00
jekyllbot
a70abbeab5
Merge pull request #5337 from jekyll/fix-convertible-5308
...
Merge pull request 5337
2016-09-08 11:27:35 -07:00
Ashwin Maroli
8813173ba7
set empty url in config file by default
2016-09-08 15:47:28 +05:30
jekyllbot
6ebdcdb198
Update history to reflect merge of #5316 [ci skip]
2016-09-08 02:55:30 -07:00
jekyllbot
9fd7e2c063
Merge pull request #5316 from DirtyF/markdown--default-extension
...
Merge pull request 5316
2016-09-08 02:55:30 -07:00
jekyllbot
eefcbf5dde
Update history to reflect merge of #5335 [ci skip]
2016-09-08 02:54:03 -07:00
jekyllbot
19f7a0b8fc
Merge pull request #5335 from DirtyF/copy-theme-files
...
Merge pull request 5335
2016-09-08 02:54:02 -07:00
Parker Moore
c1e6f1fb94
Fix rubocop errors & add one more test for slugify 'ascii' mode ( #4680 )
2016-09-07 17:50:14 -07:00
Parker Moore
9164973a6c
Merge branch 'jussikinnula-master'
...
* jussikinnula-master:
Fix slugify test
One final "urlsafe" replaced with "ascii"
Change urlsafe to ascii also when actually slugifying
Add tests for ascii slugify mode
Rename urlsafe to ascii, and document it (on utils.rb)
Add urlsafe to accepted slugify modes
Add urlsafe method for slugify
2016-09-07 16:50:32 -07:00