Skip to content

Commit

Permalink
update elFinder to v2.1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
dleffler committed Nov 25, 2016
1 parent 21e08a0 commit af398df
Show file tree
Hide file tree
Showing 62 changed files with 2,814 additions and 1,306 deletions.
4 changes: 2 additions & 2 deletions external/ExtPrograms.csv
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ Respond,1.4.2,github.com/scottjehl/Respond,1.4.2,IE6-8 shim
html5shiv,3.7.3,github.com/aFarkas/html5shiv,3.7.3,IE6-8 shim
csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
excanvas,r3,code.google.com/p/explorercanvas/,r3,IE6-8 shim needed by TimesCircle
CKEditor,4.5.11,ckeditor.com,4.5.11,"add fieldinsert (exp), tableresize, sourcedialog, image2 & imageupload widgets & kama skin"
CKEditor,4.5.11,ckeditor.com,4.6.0,"add fieldinsert (exp), tableresize, sourcedialog, image2 & imageupload widgets & kama skin"
TinyMCE,4.4.3,tinymce.com,4.4.3,"add fieldinsert (exp) & quickupload plugins, & xenmce skin"
PLUpload,2.1.9,github.com/moxiecode/plupload,2.1.9,"needed for TinyMCE Quick Upload, placed in that plugin folder"
elFinder,2.1.16n,elfinder.org,2.1.16n,"use https://github.com/nao-pon/elFinder, customized in /framework with Exponent php classes and .js files"
elFinder,2.1.16n,elfinder.org,2.1.18n,"use https://github.com/nao-pon/elFinder, customized in /framework with Exponent php classes and .js files"
jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
jQuery,2.2.4,jquery.com,2.2.4,
jQuery Migrate,1.4.1,jquery.com,1.4.1,renamed to migrate.js for easy loading as an addon
Expand Down
46 changes: 45 additions & 1 deletion external/elFinder/Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
2016-11-21 Naoki Sawada <hypweb@gmail.com>

* elFinder (2.1.18):

- [VD:FTP] Fixed #1757 cause infinite loop with getting stat of second level items from system root
- [js:core] Fixed #1761 problem of chunk merge request on 2.1.17
- [php:core] Fixed #1762 broken backward compatibility of PHP < 5.4 on 2.1.17
- And some minor bug fixes


2016-11-19 Naoki Sawada <hypweb@gmail.com>

* elFinder (2.1.17):

- [cmd:upload] Fixed #1695 disabled check doesn't work in other than CWD volume
- [js:core] Fixed #1698 abort the file upload at network error occurs
- [ui:toolbar] Fixed #1699 add an option `displayTextLabel` (default: `false`)
- [css:toolbar] Fixed #1700 correction of button label for touch devices
- [ui:toolbar] add contextmenu to show/hide the text label
- [ui:workzone] Fixed #1702 cwd size fits to the workzone at resize
- [VD:abstract] Fixed #1703 problem of make the video thumbnail
- [core] Fixed #1706 configurable to limit max number of selectable items
- Added an option `maxTargets` of connector main option.
- [ui:cwd] Fixed #1701 No thumbnails after added the item (v 2.1.16)
- [cmd:download] Fixed #1707 allow zip download in multi volume searching
- Added native driver for GoogleDrive, OneDrive and Box (Special thanks to Raja Sharma)
- [cmd:netmount] Fixed #1713 OAuth of procedure is not completed on MS Edge
- [css:quicklook] Fixed #1717 preview html file won't scroll on IOS
- [cmd:upload] Fixed #1718 File upload on paste does not work
- [js:core] Fixed #1724 add client option `enableByMouseOver`
- [js:core] Fixed #1724 disable event `disable` with option `enableAlways=true`
- [js:core] Fixed #1724 optimize switching enable/disable for elf in iframe
- [cmd:getfile] Fixed #1727 wrong path when the tree is not loaded
- [cmd:quicklook] Fixed #1737 select next item after an item deleted
- [cmd:mkdir] Fixed #1739 Add 'new folder' action to tree context menu
- [VD:abstract,LocalFileSystem] Fixed #1744 results `url` must be urlencoded
- [js:core] Fixed #1738 retry uploading only on connection aborted
- [cmd:search] Fixed #1745 "onlyMimes" option invalid in search results
- [js:core] Fixed #1738 bug in the retry function on chunked uploading
- [php:plugin:AutoResize] Fixed #1746 add an option `forceEffect` (default:false)
- [js:core,cmd:quicklook] Fixed #1748 add client option `rawStringDecoder`
- And some minor bug fixes


2016-10-11 Naoki Sawada <hypweb@gmail.com>

* elFinder (2.1.16):
Expand Down Expand Up @@ -263,7 +307,7 @@
- And some minor bug fixes


2015-12-26 Naoki Sawada <hypweb@gmail.com>
2015-12-26 Naoki Sawada <hypweb@gmail.com>

* elFinder (2.0.5):
- Fixed problem if filename included character that can't be json encode
Expand Down
15 changes: 15 additions & 0 deletions external/elFinder/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
elFinder is issued under a 3-clauses BSD license.

Copyright (c) 2009-2016, Studio 42
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the Studio 42 Ltd. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL "STUDIO 42" OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36 changes: 6 additions & 30 deletions external/elFinder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Features
* [Normalizer](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/Normalizer/plugin.php) : UTF-8 Normalizer of file-name and file-path etc.
* [Sanitizer](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/Sanitizer/plugin.php) : Sanitizer of file-name and file-path etc.
* [Watermark](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/Watermark/plugin.php) : Print watermark on file upload.
* Folder upload with Chrome
* Folder upload with Chrome, Firefox and Edge
* Chunked file upload
* Upload directly to the folder
* Upload form URL (or list)
Expand Down Expand Up @@ -127,7 +127,7 @@ Installation
Downloads
------------
**Stable releases** ([Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog))
+ [elFinder 2.1.16](https://github.com/Studio-42/elFinder/archive/2.1.16.zip)
+ [elFinder 2.1.18](https://github.com/Studio-42/elFinder/archive/2.1.18.zip)
+ [elFinder 2.0.7](https://github.com/Studio-42/elFinder/archive/2.0.7.zip)

**Nightly builds**
Expand All @@ -137,8 +137,8 @@ Downloads
Demo sites
------------
**2.1.x Nightly**
+ http://studio-42.github.io/elFinder/ (with CORS)
+ http://hypweb.net/elFinder-nightly/demo/2.1/
+ https://studio-42.github.io/elFinder/ (with CORS)
+ https://hypweb.net/elFinder-nightly/demo/2.1/

FAQs
------------
Expand Down Expand Up @@ -179,6 +179,7 @@ You can create or modify the language file to use translation tool. Please refer
* [lokothodida/elfinder-theme-moono](https://github.com/lokothodida/elfinder-theme-moono)
* [lokothodida/elfinder-theme-windows-10](https://github.com/lokothodida/elfinder-theme-windows-10)
* [StudioJunkyard/elfinder-boostrap-theme](https://github.com/StudioJunkyard/LibreICONS/tree/master/themes/elFinder)
* [RobiNN1/elFinder-Material-Theme](https://github.com/RobiNN1/elFinder-Material-Theme)

Support
-------
Expand All @@ -205,29 +206,4 @@ License

elFinder is issued under a 3-clauses BSD license.

<pre>
Copyright (c) 2009-2016, Studio 42
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Studio 42 Ltd. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL "STUDIO 42" BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre>
* [License terms](https://github.com/Studio-42/elFinder/blob/master/LICENSE.md)
26 changes: 17 additions & 9 deletions external/elFinder/css/commands.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
text-align: right;
width: 4em;
}
.elfinder-resize-control input.elfinder-resize-bg {
.elfinder-resize-control input.elfinder-resize-bg {
text-align: center;
width: 5em;
direction: ltr;
Expand Down Expand Up @@ -171,10 +171,10 @@
width: 10px;
height: 10px;
}
.elfinder-dialog .elfinder-dialog-resize .ui-resizable-se {
background:transparent;
bottom:0;
right:0;
.elfinder-dialog .elfinder-dialog-resize .ui-resizable-se {
background:transparent;
bottom:0;
right:0;
margin-right:-7px;
margin-bottom:-7px;
}
Expand Down Expand Up @@ -326,9 +326,9 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {

.elfinder-help .ui-priority-primary { margin-bottom:7px;}

.elfinder-help-team {
clear: both;
text-align:right;
.elfinder-help-team {
clear: both;
text-align:right;
border-bottom:1px solid #ccc;
margin:.5em 0;
font-size:.9em;
Expand Down Expand Up @@ -424,6 +424,14 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
/*font-size: 1.2em;*/
}

/********************** COMMAND "INFO" ****************************/
.elfinder-info-title .elfinder-cwd-bgurl:after {
left: -28px;
}
.elfinder-info-title .elfinder-cwd-icon-video:after {
left: -7px;
}

/********************** COMMAND "UPLOAD" ****************************/
.elfinder-upload-dialog-wrapper .elfinder-upload-dirselect {
position: absolute;
Expand All @@ -433,7 +441,7 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
padding: 10px;
border: none;
overflow: hidden;
cursor: pointer;
cursor: pointer;
}
.elfinder-ltr .elfinder-upload-dialog-wrapper .elfinder-upload-dirselect {
left: 2px;
Expand Down
5 changes: 3 additions & 2 deletions external/elFinder/css/contextmenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
.elfinder-navbar-root-sql.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_sql.png"); }
.elfinder-navbar-root-dropbox.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_dropbox.png"); }
.elfinder-navbar-root-googledrive.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_googledrive.png"); }

.elfinder-navbar-root-onedrive.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_onedrive.png"); }
.elfinder-navbar-root-box.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_box.png"); }

/* text in item */
.elfinder .elfinder-contextmenu .elfinder-contextmenu-item span { display:block; }
Expand Down Expand Up @@ -103,7 +104,7 @@
.elfinder .elfinder-contextmenu-rtl .elfinder-contextmenu-arrow { left:5px; background-position: 0 -10px; }

/* command extra icon's <a>, <span> tag */
.elfinder .elfinder-contextmenu-extra-icon a,
.elfinder .elfinder-contextmenu-extra-icon a,
.elfinder .elfinder-contextmenu-extra-icon span {
display: inline-block;
width: 100%;
Expand Down

0 comments on commit af398df

Please sign in to comment.