Skip to content

Commit

Permalink
Update tinymce to v4.6.2
Browse files Browse the repository at this point in the history
linux-man committed May 24, 2017
1 parent 3c69b99 commit 5c8b236
Showing 71 changed files with 71,238 additions and 66,182 deletions.
6 changes: 3 additions & 3 deletions debian/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: unreel
Version: 1.1.0
Version: 1.2.0
License: GPL-3.0
Vendor: Caldas Lopes <[email protected]>
Architecture: amd64
Maintainer: Caldas Lopes <[email protected]>
Installed-Size: 145639
Depends: gconf2, gconf-service, libnotify4, libappindicator1, libxtst6, libnss3
Installed-Size: 155262
Depends: gconf2, gconf-service, libnotify4, libappindicator1, libxtst6, libnss3, libxss1
Section: Contrib
Priority: extra
Homepage: https://github.com/linux-man/unreel#readme
62 changes: 0 additions & 62 deletions js/tinymce/.eslintrc

This file was deleted.

1,219 changes: 647 additions & 572 deletions js/tinymce/changelog.txt

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions js/tinymce/license.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999

Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -10,7 +10,7 @@
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]

Preamble
Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow. Pay close attention to the difference between a
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

GNU LESSER GENERAL PUBLIC LICENSE
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License Agreement applies to any software library or other
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

NO WARRANTY
NO WARRANTY

15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Libraries

15 changes: 9 additions & 6 deletions js/tinymce/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinymce",
"version": "4.5.4",
"version": "4.6.2",
"repository": {
"type": "git",
"url": "https://github.com/tinymce/tinymce.git"
@@ -15,18 +15,21 @@
"node": ">=0.10.26"
},
"scripts": {
"test": "grunt bedrock"
"test": "grunt bedrock-manual"
},
"dependencies": {
"@ephox/katamari": "^1.1.0",
"@ephox/sugar": "^3.1.0"
},
"devDependencies": {
"@ephox/bolt": "^1.6.0",
"@ephox/imagetools": "1.0.6",
"@ephox/mcagar": "^1.0.0",
"amdlc": "^0.1.8",
"@ephox/imagetools": "2.0.0",
"@ephox/mcagar": "^1.1.1",
"@ephox/bedrock": "^1.5.0",
"grunt": "~1.0.1",
"grunt-contrib-clean": "~1.0.0",
"grunt-contrib-copy": "~1.0.0",
"grunt-contrib-less": "~1.4.0",
"grunt-contrib-qunit": "~1.2.0",
"grunt-contrib-uglify": "~2.0.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-eslint": "~19.0.0",
Loading

0 comments on commit 5c8b236

Please sign in to comment.