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
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
6d7f305e7c
Add tests for assets directory support.
2016-09-16 16:04:35 -07:00
cf26bf5db0
TestTheme: update tests for 'path_for' now that it's no longer prepending the underscore
2016-09-16 15:36:33 -07:00
87b9cfe2b5
ThemeBuilder: add 'assets' to list of scaffold directories
2016-09-16 14:57:58 -07:00
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
562ffe7a3f
Update history to reflect merge of #5361 [ci skip]
2016-09-16 12:58:42 -07:00
c877d6f75c
Merge pull request #5361 from DirtyF/patch-1
...
Merge pull request 5361
2016-09-16 12:58:42 -07:00
0233d93352
vendor is now excluded by default [ci-skip]
2016-09-16 18:25:06 +02:00
59b61c3f9f
Exclude vendor by default
2016-09-16 07:56:37 +02:00
57fd5f887d
Update history to reflect merge of #5199 [ci skip]
2016-09-13 07:11:51 -07:00
4888b84b44
Merge pull request #5199 from jeffkole/adds-linking-to-all-files
...
Merge pull request 5199
2016-09-13 07:11:50 -07:00
55de780520
Update history to reflect merge of #5347 [ci skip]
2016-09-12 00:26:00 -07:00
42725b1325
Merge pull request #5347 from vohedge/patch-1
...
Merge pull request 5347
2016-09-12 00:26:00 -07:00
d86a293d78
Fix typo
2016-09-11 00:18:02 +09:00
a2e911c1b5
Update history to reflect merge of #5326 [ci skip]
2016-09-09 13:53:28 -07:00
3e0363be4a
Merge pull request #5326 from ashmaroli/gitignore-gem
...
Merge pull request 5326
2016-09-09 13:53:28 -07:00
aa2cfc81b7
Update history to reflect merge of #5337 [ci skip]
2016-09-08 11:27:36 -07:00
a70abbeab5
Merge pull request #5337 from jekyll/fix-convertible-5308
...
Merge pull request 5337
2016-09-08 11:27:35 -07:00
6ebdcdb198
Update history to reflect merge of #5316 [ci skip]
2016-09-08 02:55:30 -07:00
9fd7e2c063
Merge pull request #5316 from DirtyF/markdown--default-extension
...
Merge pull request 5316
2016-09-08 02:55:30 -07:00
eefcbf5dde
Update history to reflect merge of #5335 [ci skip]
2016-09-08 02:54:03 -07:00
19f7a0b8fc
Merge pull request #5335 from DirtyF/copy-theme-files
...
Merge pull request 5335
2016-09-08 02:54:02 -07:00
c1e6f1fb94
Fix rubocop errors & add one more test for slugify 'ascii' mode ( #4680 )
2016-09-07 17:50:14 -07:00
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
f53a3b6272
Update history to reflect merge of #5235 [ci skip]
2016-09-07 16:34:37 -07:00
dddafccb36
Merge pull request #5235 from jekyll/update-windows-detection-to-check-proc-version
...
Merge pull request 5235
2016-09-07 16:34:37 -07:00
8c979ec565
Update history to reflect merge of #5318 [ci skip]
2016-09-07 16:28:01 -07:00
3d38e8510c
Merge pull request #5318 from ashmaroli/docs-themes-update
...
Merge pull request 5318
2016-09-07 16:28:01 -07:00
3840a38081
Convertible: set self.output in #render_all_layouts and #do_layout
2016-09-07 15:59:43 -07:00
d632cdda68
Update history to reflect merge of #5334 [ci skip]
2016-09-07 15:04:17 -07:00
57ab7c5f98
Merge pull request #5334 from Crunch09/issue-5144
...
Merge pull request 5334
2016-09-07 15:04:17 -07:00
f0293def80
[docs] add help for missing static_file e.g. on heroku
...
fixes #5144
2016-09-07 09:07:35 +02:00
42b85bb82f
explain how to copy theme's file
2016-09-07 02:00:51 +02:00
b47db14f86
add future gems to gitignore
2016-09-05 15:14:59 +05:30
a666e6faee
update line about semver to be less authoritative
2016-09-04 13:04:24 +05:30
jekyllbot
jekyllbot
Parker Moore
Ashwin Maroli
Pat Hawks
Kyle O'Brien
Frank Taillandier
vohedge
Florian Thomas