github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-02-13 08:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,990 Commits 60 Branches 160 Tags
279f1516d23f8951e9d35e40571dfb3cbdf1d50d
Commit Graph

7990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
jekyllbot
f53a3b6272 Update history to reflect merge of #5235 [ci skip] 2016-09-07 16:34:37 -07:00
jekyllbot
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
jekyllbot
8c979ec565 Update history to reflect merge of #5318 [ci skip] 2016-09-07 16:28:01 -07:00
jekyllbot
3d38e8510c Merge pull request #5318 from ashmaroli/docs-themes-update 
Merge pull request 5318
 2016-09-07 16:28:01 -07:00
Parker Moore
3840a38081 Convertible: set self.output in #render_all_layouts and #do_layout 2016-09-07 15:59:43 -07:00
jekyllbot
d632cdda68 Update history to reflect merge of #5334 [ci skip] 2016-09-07 15:04:17 -07:00
jekyllbot
57ab7c5f98 Merge pull request #5334 from Crunch09/issue-5144 
Merge pull request 5334
 2016-09-07 15:04:17 -07:00
Florian Thomas
f0293def80 [docs] add help for missing static_file e.g. on heroku 
fixes #5144
 2016-09-07 09:07:35 +02:00
Frank Taillandier
42b85bb82f explain how to copy theme's file 2016-09-07 02:00:51 +02:00
Ashwin Maroli
b47db14f86 add future gems to gitignore 2016-09-05 15:14:59 +05:30
Ashwin Maroli
a666e6faee update line about semver to be less authoritative 2016-09-04 13:04:24 +05:30
jekyllbot
f69671c46c Update history to reflect merge of #5320 [ci skip] 2016-09-03 13:36:22 -07:00
jekyllbot
08436d75b8 Merge pull request #5320 from jrmessias/master 
Merge pull request 5320
 2016-09-03 13:36:21 -07:00