Skip to content

Commit

Permalink
Merge pull request #7734 from bolt/release/3.6.4
Browse files Browse the repository at this point in the history
Preparing release 3.6.4.
  • Loading branch information
bobdenotter committed Jan 24, 2019
2 parents aa104b6 + fa8adb0 commit c37bc1c
Show file tree
Hide file tree
Showing 331 changed files with 2,615 additions and 2,440 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License (MIT)

Copyright (c) 2013-2018 Bolt
Copyright (c) 2013-2019 Bolt

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
652 changes: 386 additions & 266 deletions app/src/lib/ckeditor/CHANGES.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/src/lib/ckeditor/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

CKEditor - The text editor for Internet - https://ckeditor.com/
Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down Expand Up @@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.

The following libraries are included in CKEditor under the MIT license (see Appendix D):

* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2018, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2019, CKSource - Frederico Knabben.
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.

Expand Down
11 changes: 6 additions & 5 deletions app/src/lib/ckeditor/build-config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/license
*/

/**
Expand All @@ -10,13 +10,13 @@
* If you would like to build CKEditor online again
* (for example to upgrade), visit one the following links:
*
* (1) http://ckeditor.com/builder
* (1) https://ckeditor.com/cke4/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/638d0bc40e6b5c592a031406d8464971
* (2) https://ckeditor.com/cke4/builder/9705ed1f5e13d331e24bd0e950b94e0e
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/638d0bc40e6b5c592a031406d8464971
* (3) https://ckeditor.com/cke4/builder/download/9705ed1f5e13d331e24bd0e950b94e0e
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand All @@ -38,6 +38,7 @@ var CKBUILDER_CONFIG = {
'.jshintignore',
'.jshintrc',
'.mailmap',
'.npm',
'.travis.yml',
'README.md',
'bender-err.log',
Expand Down
1,068 changes: 539 additions & 529 deletions app/src/lib/ckeditor/ckeditor.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/src/lib/ckeditor/config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see https://ckeditor.com/legal/ckeditor-oss-license
*/

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here.
// For complete reference see:
// https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
// http://docs.ckeditor.com/#!/api/CKEDITOR.config

// The toolbar groups arrangement, optimized for a single toolbar row.
config.toolbarGroups = [
Expand Down
2 changes: 1 addition & 1 deletion app/src/lib/ckeditor/contents.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

Expand Down
6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/af.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ar.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/az.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/bg.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/bn.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/bs.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ca.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/cs.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/cy.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/da.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/de-ch.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/de.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/el.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/en-au.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/en-ca.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/en-gb.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/en.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/eo.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/es-mx.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/es.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/et.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/eu.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/fa.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/fi.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/fo.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/fr-ca.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/fr.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/gl.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/gu.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/he.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/hi.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/hr.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/hu.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/id.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/is.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/it.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ja.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ka.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/km.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ko.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ku.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/lt.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/lv.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/mk.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/mn.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ms.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/nb.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/nl.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/no.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/oc.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/pl.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/pt-br.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/pt.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ro.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ru.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/si.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/sk.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/sl.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/sq.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/sr-latn.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/sr.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/sv.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/th.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/tr.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/tt.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/ug.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/uk.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/vi.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/zh-cn.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/src/lib/ckeditor/lang/zh.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/lib/ckeditor/plugins/about/dialogs/about.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/src/lib/ckeditor/plugins/clipboard/dialogs/paste.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/src/lib/ckeditor/plugins/dialog/dialogDefinition.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/
2 changes: 1 addition & 1 deletion app/src/lib/ckeditor/plugins/find/dialogs/find.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c37bc1c

Please sign in to comment.