Commit Graph

2798 Commits

Author SHA1 Message Date
Pat Hawks 9d66fc2292
Release 💎 3.4.3 2017-03-21 10:00:04 -04:00
jekyllbot 2907825f62 Merge pull request #5957 from jekyll/pull/escape_colon
Merge pull request 5957
2017-03-21 09:12:16 -04:00
William Entriken f93453368a Prefer .yaml over .toml 2017-03-20 10:56:34 -04:00
Pat Hawks ec5b45cd7c
Allow colons in `uri_escape` filter
Fixes #5954
2017-03-16 07:54:13 -05:00
Parker Moore 511481e626
Release 💎 3.4.2 2017-03-09 15:39:21 -05:00
jekyllbot 4bf2090534 Merge pull request #5903 from ashmaroli/about-no-includes
Merge pull request 5903
2017-03-06 21:05:05 -05:00
Parker Moore 9b91b248ab
Release 💎 3.4.1 2017-03-03 12:09:04 -05:00
Parker Moore 4085e29f80
Document::DATE_FILENAME_MATCHER: allow abbreviated dates in post filenames 2017-03-01 21:39:23 -05:00
Ashwin Maroli 90d7472388 Remove dependency on include from default about.md
This ensures better portability, allowing to switch and preview
themes without having to delete the code block.
2017-02-25 08:37:30 +05:30
Parker Moore 5bc67c1fb7
Convertible#validate_permalink!: ensure the return value of data["permalink"] is a string before asking if it is empty 2017-02-10 21:56:43 -05:00
jekyllbot afe6e3622c Merge pull request #5860 from ashmaroli/exclude-patch
Merge pull request 5860
2017-02-10 21:10:09 -05:00
Ben Balter 229769e249
add StaticFileDrop 2017-02-08 17:44:47 -05:00
Ashwin Maroli 3745b24564 update comment for `exclude` array 2017-02-05 07:55:26 +05:30
Ashwin Maroli 6316856773 comment out 'exclude:' in config file 2017-02-05 01:28:43 +05:30
Ashwin Maroli 4e40593a53 exclude Gemfile and its lockfile by default 2017-02-05 01:26:41 +05:30
jekyllbot 2cf685feb2 Merge pull request #4362 from jekyll/liquid-4
Merge pull request 4362
2017-01-27 11:10:53 -05:00
Parker Moore d266354e42
Merge branch 'master' into release-3-4-0
* master: (39 commits)
  Update history to reflect merge of #5798 [ci skip]
  Update history to reflect merge of #5822 [ci skip]
  use logger.info
  run codeclimate after success
  Update history to reflect merge of #5819 [ci skip]
  Fixed inaccuracy in "Built-in permalink styles" docs [skip ci]
  Update history to reflect merge of #5802 [ci skip]
  Update history to reflect merge of #5811 [ci skip]
  Update history to reflect merge of #5690 [ci skip]
  Update history to reflect merge of #5815 [ci skip]
  Review CI pages
  Rework CI doc to include multiple providers.
  Update history to reflect merge of #5812 [ci skip]
  Add jekyll-ga plug-in
  Update configuration.md
  Add mention of classifier-reborn for LSI
  Update history to reflect merge of #5810 [ci skip]
  Got that diaper money?
  Added note about --blank flag
  Update history to reflect merge of #5797 [ci skip]
  ...
2017-01-26 16:15:07 -05:00
Joel Meyer-Hamme 4b19e93f09 use logger.info
Imo running `--lsi` should use `Jekyll.logger.info`, so it can be made `--quiet`.
2017-01-26 16:02:08 +00:00
Parker Moore b7f44e6eca
Queue up a 3.4 deploy with unfinished release post. 2017-01-18 16:54:36 -05:00
jekyllbot 477b2f0f3e Merge pull request #5640 from jekyll/jekyll-utils-exec
Merge pull request 5640
2017-01-18 14:15:11 -05:00
Parker Moore 023476049b
Remove superfluous self. 2017-01-17 16:21:28 -05:00
Parker Moore 9a5307c3f9
Don't include the theme's includes_path if it is nil. 2017-01-16 19:17:45 -05:00
Florian Thomas ecd04badf0 throw IncludeTagError if error occurs in included file
fixes #5756
2017-01-15 20:35:10 +01:00
jekyllbot aa63deb2a9 Merge pull request #5750 from jekyll/no-implicit-conversion-of-nil-to-string
Merge pull request 5750
2017-01-14 00:01:31 -05:00
Pat Hawks 1d885911bc
Rubocop: Require consistent comma in multiline literals 2017-01-12 17:52:29 -06:00
Parker Moore 02858fdf08 include: improve boolean logic in #valid_include_file? 2017-01-11 12:05:56 -05:00
jekyllbot bf33dc7f50 Merge pull request #5621 from rogerogden/patch-1
Merge pull request 5621
2017-01-10 12:05:58 -08:00
Frank Taillandier 31178bfe69 Merge branch 'master' into liquid-4 2017-01-10 20:01:04 +01:00
Parker Moore faa67bcd62
include: fix 'no implicit conversion of nil to String'
This is when either 'dir' or 'file' is nil.
2017-01-10 12:12:55 -05:00
Pat Hawks 0f2013114c
Merge branch 'master' into jekyll-utils-exec 2017-01-06 05:42:15 -06:00
Pat Hawks 1e4b779ab3
Escape # 2017-01-05 18:34:44 -06:00
Pat Hawks 5652c10305
Try to replace `URI.escape` with Addressable 2017-01-05 18:01:00 -06:00
Pat Hawks 6fb05e0799
Use Addressable instead of URI to decode 2017-01-05 17:44:54 -06:00
Chayoung You de6d62b2e3
Use the current year for the LICENSE of theme 2017-01-02 22:29:25 +09:00
Pat Hawks 72a56d9eb7
Check for `to_time` 2016-12-22 19:18:43 -06:00
Pat Hawks f7edcceb70
Check return value of `to_date` 2016-12-22 16:15:09 -06:00
Pat Hawks 2eb8469936
Never throw on `sample` 2016-12-22 15:48:03 -06:00
Pat Hawks 607ab66707 Use Liquid's own `to_integer` 2016-12-22 15:32:55 -06:00
Pat Hawks c42eb7fc3a Take advantage of Liquid::Utils.to_date 2016-12-22 15:32:45 -06:00
Kevin Wojniak 2fc800ebd2 Use each instead of map to actually return nothing 2016-12-18 17:32:19 -08:00
Frank Taillandier 48f7a155c3 reindent attributes 2016-12-18 08:55:05 +01:00
Frank Taillandier d134afcd4a ran rubocop -a 2016-12-18 07:22:36 +01:00
Frank Taillandier de56b977b6 ran rubocop -a
#5665
2016-12-18 07:22:11 +01:00
Parker Moore 7862f731b6
grouping filters: use Liquid::ParseContext to create variable. 2016-12-16 15:38:19 -08:00
Florian Thomas dde0441b3a
find keys also in assigned collections 2016-12-16 15:37:10 -08:00
Florian Thomas dbea1ca80b
parse expressions before passing it to Liquid::Condition 2016-12-16 15:37:04 -08:00
jekyllbot 8ed324007a Merge pull request #5513 from thiagoarrais/5415-group_by_exp-filter
Merge pull request 5513
2016-12-09 16:01:21 -08:00
jekyllbot 1049802499 Merge pull request #5612 from ashmaroli/win-tz
Merge pull request 5612
2016-12-08 20:09:01 -08:00
Parker Moore 3c139a09f1
Care about things. 2016-12-07 18:00:47 -08:00
Parker Moore 18c2b0827e
Appease rubocop. 2016-12-07 17:53:45 -08:00
Parker Moore 6e2449b482
Write Jekyll::Utils::Exec.run for running shell commands. 2016-12-07 17:38:22 -08:00
Dean Attali f3300c1772 use backticks for Gemfile for consistency since in the next sentence _config.yml file has backtick 2016-12-07 19:45:19 -05:00
Ashwin Maroli f8456e02c1 narrow it down to only Windows 2016-12-06 15:38:18 +05:30
Ashwin Maroli 31eeb1a561 add 'tzinfo-data' gem to generated Gemfile 2016-12-06 15:38:18 +05:30
Ashwin Maroli c4142c4c77 add a utility submodule to define 'TZ' on Windows 2016-12-06 15:38:18 +05:30
Alexey Rogachev 8d4950d6e4 Fixed typo 2016-12-05 13:31:47 +06:00
Roger Ogden 7b73abcdd9 Deleted trailing whitespace on line 22 2016-12-02 17:18:30 -07:00
Roger Ogden ed9520cd3b Fixes #5498
Updated data_reader.rb comments to more accurately reflect read() and read_data_to() functionality.
2016-12-02 16:58:31 -07:00
Thiago Arrais 91f0b91d6a Rename for more idiomatic Ruby 2016-11-30 18:16:25 -03:00
jekyllbot 805dd4b0f1 Merge pull request #5611 from XhmikosR/https
Merge pull request 5611
2016-11-29 15:50:29 -08:00
XhmikosR d9cf97e9c6 Switch to `https` when possible.
Also, remove two 404 links.
2016-11-29 23:39:23 +02:00
jona fac041933c fix date parsing in file names 2016-11-29 09:14:03 +01:00
Eldritch Cheese a55760d4ad Added unit test for special character, fixed error that it exposed. 2016-11-26 22:31:03 -05:00
Eldritch Cheese bbdeb32f38 Escaped regular expressions when using post_url.
Previously, the post_url function would give error messages when the
post being listed contained special characters for use in regular
expressions.  These special characters are now escaped using
Regexp.escape.
2016-11-26 16:51:01 -05:00
Tim Banks 5c965d6a20 Add connector param to array_to_sentence_string filter 2016-11-22 17:38:33 -06:00
Parker Moore 7c44c5a56d
Release 💎 3.3.1 2016-11-14 14:36:05 -08:00
Parker Moore d3e387d146
Fix typo. 2016-11-14 13:30:14 -08:00
Parker Moore ff012e795a
Fix fmt error. 2016-11-11 16:30:53 -08:00
Parker Moore d50ef0e3dd
Add useful comment. 2016-11-11 16:30:53 -08:00
Parker Moore 347651e571
URL#generate_url_from_drop: be smarter about replacing *just* the keys 2016-11-11 16:30:53 -08:00
jekyllbot f8ec71af3b Merge pull request #5464 from jekyll/allow-regular-windows-watchers
Merge pull request 5464
2016-11-10 15:05:41 -08:00
Parker Moore df45f26187
Builder.watch: only warn for Bash on Windows, still try watching. 2016-11-10 12:55:00 -08:00
Jordon Bedwell d71dff74ae
Fix #5462: Only shutdown watch in Bash On Windows. 2016-11-10 12:55:00 -08:00
Parker Moore 7bf4627046
Add vendor/gems to the list of excluded & do some refactoring. 2016-11-09 09:42:26 -08:00
Parker Moore b194211a32
Be much more specific about ignoring vendored directories. 2016-11-09 09:42:26 -08:00
jekyllbot f10c914fd5 Merge pull request #5524 from fene/nomethoderror
Merge pull request 5524
2016-11-08 17:05:18 -08:00
Thiago Arrais 7ac9653f4e RDoc for group_by_exp 2016-11-04 18:32:52 -03:00
Thiago Arrais 7f18ac8f99 Group using arbitraty Liquid expressions 2016-11-04 18:16:46 -03:00
fen e92dd2055d check for the urldrop key first 2016-11-02 21:30:23 +01:00
fen 2d35364c02 implement warning about missing keys in url drops 2016-11-02 00:22:41 +01:00
jekyllbot 4896f54b87 Merge pull request #5457 from ashmaroli/dependency-template
Merge pull request 5457
2016-10-24 14:49:19 -07:00
Chris Stein 9bb242b44a fix _config.yml typo in site_template
Found a typo when going through a tutorial. Replacing `these this` with `this`
2016-10-23 15:26:50 -05:00
jekyllbot eca7f46749 Merge pull request #5495 from jekyll/pr/layouts-error
Merge pull request 5495
2016-10-19 21:24:11 -07:00
Pat Hawks 51d9be83a1
Do not swallow all exceptions on render 2016-10-18 19:45:03 -05:00
Pat Hawks c4a23b4ced
Collapse gsub 2016-10-18 18:53:54 -05:00
Michael Large 6cec4aebc6 Additional typo related to pull request #5472 2016-10-11 09:05:39 -04:00
Michael Large f2fcd17627 Fix typo in theme_template README 2016-10-10 11:10:41 -04:00
Ashwin Maroli 08b30056b7 replace development_dependency with runtime_dependency 2016-10-06 23:42:16 +05:30
Parker Moore 5e93ca6353
Release 💎 3.3.0 2016-10-06 11:12:15 -07:00
jekyllbot 21cd382409 Merge pull request #5456 from jekyll/revert-server-address-sig-change
Merge pull request 5456
2016-10-06 10:36:49 -07:00
jekyllbot 6f05ebb520 Merge pull request #5433 from ayastreb/5429-data-dir-with-period-in-name
Merge pull request 5433
2016-10-06 10:22:23 -07:00
Parker Moore ed042de6c4
Oh fine, rubocop. 2016-10-06 10:15:45 -07:00
Parker Moore 63e4e750ec
New site: lock minima to v2.x 2016-10-06 09:58:16 -07:00
Parker Moore 6d1bc6c6ea
Revert Commands::Serve#server_address signature change. 2016-10-06 09:48:37 -07:00
Parker Moore 6f2d1591fc
Release 💎 3.3.0.pre.rc1 2016-10-05 11:47:43 -07:00
jekyllbot 3de78877c0 Merge pull request #4873 from mlocher/bug-post-url
Merge pull request 4873
2016-10-05 11:40:04 -07:00
jekyllbot 22a7714bba Merge pull request #5212 from eloyesp/fix-excerpt-link-finder
Merge pull request 5212
2016-10-05 11:34:52 -07:00
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
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