github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 09:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,421 Commits 60 Branches 160 Tags
0d62e7fb416c1cbf00aef6a5dfa6aba68a61ba60
Commit Graph

2651 Commits

Author SHA1 Message Date
jekyllbot
275f5a6209 Merge pull request #5256 from kwokfu/patch-1 
Merge pull request 5256
 2016-10-05 11:34:06 -07:00
jekyllbot
d879840cc5 Merge pull request #5431 from Crunch09/update_url_in_dev_environment 
Merge pull request 5431
 2016-10-05 09:59:01 -07:00
Florian Thomas
a945a65818 refactor to use server_address 2016-10-04 20:47:36 +02:00
Anatoliy Yastreb
e27a65d9e3 Sanitize directory name as a key 2016-10-04 19:39:41 +01:00
Florian Thomas
01c33907a3 default site.url in dev environment to http://localhost:4000 
take `host`, `port` and `ssl` options into account
 2016-10-04 20:38:46 +02:00
Mark H. Wilkinson
a0a351aa7a Remove autoload of Draft which no longer exists. 2016-10-03 22:21:35 +01:00
Anatoliy Yastreb
cff8f2994c Fix loading data from subdir with a period in name #5429 2016-10-01 13:09:50 +01:00
jekyllbot
ef3f9d0e7a Merge pull request #5264 from DirtyF/static-file-name 
Merge pull request 5264
 2016-09-29 14:13:31 -07:00
jekyllbot
553fae8f17 Merge pull request #5410 from jekyll/pr/i18n-url-filters 
Merge pull request 5410
 2016-09-29 13:27:11 -07:00
jekyllbot
f0574e047e Merge pull request #5427 from jekyll/don-t-utime-if-symlink 
Merge pull request 5427
 2016-09-29 13:26:24 -07:00
Antonio
91ef3a7cc9 prepend 'jekyll serve' with 'bundle exec' 
Best not to send mixed messages and jekyllrb's quickstart message is "bundle exec jekyll serve"
 2016-09-30 02:17:08 +08:00
Parker Moore
8e91263031 StaticFile#copy_entry: don't mark modified time if path is a symlink 2016-09-28 16:55:57 -07:00
jekyllbot
6847b604c8 Merge pull request #5157 from stevecheckoway/fix-hooks-priority-order 
Merge pull request 5157
 2016-09-28 16:39:44 -07:00
jekyllbot
9c197d9555 Merge pull request #5210 from jekyll/node-must-die 
Merge pull request 5210
 2016-09-28 16:38:00 -07:00
jekyllbot
0f70bb1320 Merge pull request #5408 from ashmaroli/bundle2new 
Merge pull request 5408
 2016-09-28 16:31:08 -07:00
Parker Moore
06651c960a Merge pull request #5325 from ashmaroli/gemspec-template-patch 
update gemspec template to include only required theme files
 2016-09-27 11:30:58 -07:00
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
Pat Hawks
2b30c06140 Use Addressable to better deal with i18n URLs 2016-09-24 15:34:00 -05:00
Ashwin Maroli
3966a37d71 swallow bundle output in CI 2016-09-24 13:48:22 +05:30
Heng Kwokfu
db53213d16 Merge remote-tracking branch 'jekyll/master' into patch-1 2016-09-24 08:46:24 +08: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
Ashwin Maroli
99fc60e28c update template to include theme files 2016-09-21 06:29:34 +05:30
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
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
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