github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-31 01:38:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,041 Commits 60 Branches 160 Tags
a920cf040b3ebbbca1b3ee4b6868dd6642b2ee85
Commit Graph

2571 Commits

Author SHA1 Message Date
Frank Taillandier
6dbb5e2df1 add contextual help for overriding theme's default 2016-09-27 11:27:29 +02:00
Frank Taillandier
c4ccfae3af rename index.html to index.md 
fix https://github.com/jekyll/minima/issues/13
 2016-09-27 11:12:29 +02:00
Frank Taillandier
8321b14b29 Move contents of the index.html page to the 'home' layout 2016-09-27 08:24:58 +02:00
jekyllbot
aaa062b047 Merge pull request #5402 from ashmaroli/jekyll-new-assets 
Merge pull request 5402
 2016-09-23 14:30:39 -07:00
jekyllbot
8197e17495 Merge pull request #5399 from jekyll/relative_url_and_absolute_url 
Merge pull request 5399
 2016-09-23 14:18:01 -07:00
Ashwin Maroli
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
Parker Moore
fa96843555 URLFilters: Simplify ensure_leading_slash calls. 2016-09-22 20:58:26 -07:00
jekyllbot
992be253a6 Merge pull request #5338 from ashmaroli/config-patch 
Merge pull request 5338
 2016-09-22 20:50:47 -07:00
Parker Moore
eab6752f52 Consolidate ensure_leading_slash to 2 lines. 2016-09-22 14:40:20 -07:00
Parker Moore
aa86651650 Add absolute_url and relative_url filters. 2016-09-22 14:16:00 -07:00
jekyllbot
3a7cbadd82 Merge pull request #5375 from Nicop06/underscore_highlight 
Merge pull request 5375
 2016-09-20 17:05:49 -07:00
jekyllbot
ee84a95a38 Merge pull request #5376 from jonblatho/master 
Merge pull request 5376
 2016-09-20 17:04:57 -07:00
jekyllbot
cfe61771e0 Merge pull request #5380 from ethomson/coderay_deprecation 
Merge pull request 5380
 2016-09-20 16:39:33 -07:00
jekyllbot
504411e476 Merge pull request #5237 from ashmaroli/bundle2new 
Merge pull request 5237
 2016-09-20 15:32:25 -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
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
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
Frank Taillandier
59b61c3f9f Exclude vendor by default 2016-09-16 07:56:37 +02: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
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
3e0363be4a Merge pull request #5326 from ashmaroli/gitignore-gem 
Merge pull request 5326
 2016-09-09 13:53:28 -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
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
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
Parker Moore
3840a38081 Convertible: set self.output in #render_all_layouts and #do_layout 2016-09-07 15:59:43 -07:00
Ashwin Maroli
b47db14f86 add future gems to gitignore 2016-09-05 15:14:59 +05:30
jekyllbot
2f167aeea7 Merge pull request #5308 from jekyll/rubocop-convertible 
Merge pull request 5308
 2016-09-01 17:18:50 -07:00
Parker Moore
4af0f0262e Remove layouts named param from Renderer#initialize 2016-09-01 13:26:14 -07:00
jekyllbot
6a34966f20 Merge pull request #5189 from jekyll/skip-theme-if-not-string 
Merge pull request 5189
 2016-08-30 14:54:47 -07:00
Parker Moore
a78426f20d Convertible#read_yaml: disable Metrics/AbcSize check 2016-08-30 14:39:49 -07:00
Parker Moore
9ddc12bad8 Convertible: ensure layouts the argument and payload the argument are set properly in the renderer 2016-08-30 14:39:20 -07:00
Parker Moore
ac6bbc1906 Renderer#invalid_layout? should check if document is an excerpt 2016-08-30 14:14:52 -07:00
Parker Moore
8014c54ee0 Convertible#converters: sort the converters 2016-08-30 14:14:33 -07:00
Parker Moore
73e79f0049 Proxy Convertible#converters to Renderer#run 2016-08-30 14:14:22 -07:00
Parker Moore
8496e2e8b6 Proxy Convertible#render_liquid to Renderer 2016-08-30 14:14:12 -07:00
Parker Moore
d0f57b61d4 Proxy Convertible#transform to Renderer 2016-08-30 14:14:03 -07:00
Parker Moore
741102bd40 Proxy Convertible#converters to Renderer 2016-08-30 14:13:26 -07:00
Parker Moore
b781b9967d Proxy Convertible#render_all_layouts to Renderer.place_in_layouts 2016-08-30 14:04:57 -07:00
jekyllbot
6b121d2d85 Merge pull request #5045 from ayastreb/document-rubocop-fix 
Merge pull request 5045
 2016-08-30 13:34:55 -07:00
Parker Moore
2b15b0b325 Site#configure_theme: don't do anything if theme config is unset; TEST 2016-08-30 12:17:24 -07:00
Parker Moore
4420c3b2af Make Site#configure_theme more understandable 2016-08-30 11:58:21 -07:00