Commit Graph

2227 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Parker Moore fa96843555
URLFilters: Simplify ensure_leading_slash calls. 2016-09-22 20:58:26 -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 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
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
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 a70abbeab5 Merge pull request #5337 from jekyll/fix-convertible-5308
Merge pull request 5337
2016-09-08 11:27:35 -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 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
Eloy Espinaco 9b09d8a8e8 Add support for indented link references on excerpt
Excerpt link reference extraction is missing all the indented references
at the bottom of the page. Markdown specify that those can be indented up
to three spaces.
2016-09-02 17:21:10 -03:00
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