Changeset [50da9e7ffd441b60b631df7734c9ee8f23d7ab0e] by dleffler
June 20th, 2018 @ 03:10 PM
Merge branch 'develop'
Conflicts:
CHANGELOG.md
https://github.com/exponentcms/exponent-cms/commit/50da9e7ffd441b60...
Committed by dleffler
- A external/elFinder/img/trashmesh.png
- A external/elFinder/img/volume_icon_box.svg
- A external/elFinder/img/volume_icon_dropbox.svg
- A external/elFinder/img/volume_icon_ftp.svg
- A external/elFinder/img/volume_icon_googledrive.svg
- A external/elFinder/img/volume_icon_local.svg
- A external/elFinder/img/volume_icon_network.png
- A external/elFinder/img/volume_icon_network.svg
- A external/elFinder/img/volume_icon_onedrive.svg
- A external/elFinder/img/volume_icon_sql.svg
- A external/elFinder/img/volume_icon_trash.svg
- A external/elFinder/img/volume_icon_zip.svg
- A external/elFinder/js/commands/opennew.js
- A external/elFinder/js/commands/preference.js
- A external/elFinder/js/i18n/help/es.html.js
- A nginix.conf
- M INSTALLATION.md
- M exponent.js.php
- M external/ExtPrograms.csv
- M external/adminer/plugins/ckeditor.php
- M external/editors/ckeditor/build-config.js
- M external/editors/ckeditor/ckeditor.js
- M external/editors/ckeditor/lang/cs.js
- M external/editors/ckeditor/lang/da.js
- M external/editors/ckeditor/lang/de.js
- M external/editors/ckeditor/lang/en.js
- M external/editors/ckeditor/lang/fi.js
- M external/editors/ckeditor/lang/fr.js
- M external/editors/ckeditor/lang/nb.js
- M external/editors/ckeditor/lang/nl.js
- M external/editors/ckeditor/lang/pt-br.js
- M external/editors/ckeditor/plugins/icons.png
- M external/editors/ckeditor/plugins/icons_hidpi.png
- M external/editors/ckeditor/skins/moono-lisa/editor.css
- M external/editors/ckeditor/skins/moono-lisa/editor_gecko.css
- M external/editors/ckeditor/skins/moono-lisa/editor_ie.css
- M external/editors/ckeditor/skins/moono-lisa/editor_ie8.css
- M external/editors/ckeditor/skins/moono-lisa/editor_iequirks.css
- M external/editors/ckeditor/skins/moono-lisa/icons.png
- M external/editors/ckeditor/skins/moono-lisa/icons_hidpi.png
- M external/editors/tinymce/changelog.txt
- M external/editors/tinymce/plugins/anchor/plugin.min.js
- M external/editors/tinymce/plugins/help/plugin.min.js
- M external/editors/tinymce/plugins/image/plugin.min.js
- M external/editors/tinymce/plugins/imagetools/plugin.min.js
- M external/editors/tinymce/plugins/importcss/plugin.min.js
- M external/editors/tinymce/plugins/paste/plugin.min.js
- M external/editors/tinymce/plugins/tabfocus/plugin.min.js
- M external/editors/tinymce/plugins/table/plugin.min.js
- M external/editors/tinymce/plugins/textcolor/plugin.min.js
- M external/editors/tinymce/plugins/textpattern/plugin.min.js
- M external/editors/tinymce/plugins/visualchars/plugin.min.js
- M external/editors/tinymce/plugins/wordcount/plugin.min.js
- M external/editors/tinymce/skins/lightgray/content.inline.min.css
- M external/editors/tinymce/skins/lightgray/content.min.css
- M external/editors/tinymce/skins/lightgray/skin.min.css
- M external/editors/tinymce/themes/inlite/theme.min.js
- M external/editors/tinymce/themes/mobile/theme.min.js
- M external/editors/tinymce/themes/modern/theme.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/elFinder/Changelog
- M external/elFinder/README.md
- M external/elFinder/css/commands.css
- M external/elFinder/css/common.css
- M external/elFinder/css/contextmenu.css
- M external/elFinder/css/cwd.css
- M external/elFinder/css/dialog.css
- M external/elFinder/css/fonts.css
- M external/elFinder/css/navbar.css
- M external/elFinder/css/places.css
- M external/elFinder/css/quicklook.css
- M external/elFinder/css/statusbar.css
- M external/elFinder/css/theme.css
- M external/elFinder/css/toast.css
- M external/elFinder/css/toolbar.css
- M external/elFinder/img/dialogs.png
- M external/elFinder/img/icons-big.png
- M external/elFinder/img/logo.png
- M external/elFinder/img/toolbar.png
- M external/elFinder/js/commands/colwidth.js
- M external/elFinder/js/commands/download.js
- M external/elFinder/js/commands/edit.js
- M external/elFinder/js/commands/help.js
- M external/elFinder/js/commands/info.js
- M external/elFinder/js/commands/mkdir.js
- M external/elFinder/js/commands/netmount.js
- M external/elFinder/js/commands/open.js
- M external/elFinder/js/commands/quicklook.js
- M external/elFinder/js/commands/quicklook.plugins.js
- M external/elFinder/js/commands/rename.js
- M external/elFinder/js/commands/resize.js
- M external/elFinder/js/commands/rm.js
- M external/elFinder/js/commands/search.js
- M external/elFinder/js/commands/sort.js
- M external/elFinder/js/commands/upload.js
- M external/elFinder/js/commands/view.js
- M external/elFinder/js/elFinder.command.js
- M external/elFinder/js/elFinder.history.js
- M external/elFinder/js/elFinder.js
- M external/elFinder/js/elFinder.options.js
- M external/elFinder/js/elFinder.resources.js
- M external/elFinder/js/elFinder.version.js
- M external/elFinder/js/extras/editors.default.js
- M external/elFinder/js/i18n/elfinder.cs.js
- M external/elFinder/js/i18n/elfinder.de.js
- M external/elFinder/js/i18n/elfinder.en.js
- M external/elFinder/js/i18n/elfinder.es.js
- M external/elFinder/js/i18n/elfinder.ja.js
- M external/elFinder/js/i18n/elfinder.pl.js
- M external/elFinder/js/i18n/elfinder.ru.js
- M external/elFinder/js/i18n/elfinder.sk.js
- M external/elFinder/js/i18n/elfinder.sr.js
- M external/elFinder/js/i18n/elfinder.tr.js
- M external/elFinder/js/jquery.dialogelfinder.js
- M external/elFinder/js/ui/button.js
- M external/elFinder/js/ui/contextmenu.js
- M external/elFinder/js/ui/cwd.js
- M external/elFinder/js/ui/dialog.js
- M external/elFinder/js/ui/fullscreenbutton.js
- M external/elFinder/js/ui/navbar.js
- M external/elFinder/js/ui/searchbutton.js
- M external/elFinder/js/ui/sortbutton.js
- M external/elFinder/js/ui/toast.js
- M external/elFinder/js/ui/toolbar.js
- M external/elFinder/js/ui/tree.js
- M external/elFinder/js/ui/uploadButton.js
- M external/elFinder/js/ui/viewbutton.js
- M external/elFinder/php/elFinder.class.php
- M external/elFinder/php/elFinderConnector.class.php
- M external/elFinder/php/elFinderVolumeDriver.class.php
- M external/elFinder/php/elFinderVolumeLocalFileSystem.class.php
- M external/elFinder/php/plugins/Normalizer/plugin.php
- M external/elFinder/php/plugins/Sanitizer/plugin.php
- M external/jquery/addons/js/bootstrap-dialog.js
- M external/jquery/addons/js/jquery.dataTables.yadcf.js
- M external/jquery/addons/js/moment.js
- M external/jquery/addons/less/bootstrap-dialog.less
- M external/scssphp/example/Server.php
- M external/scssphp/src/Compiler.php
- M external/scssphp/src/Parser.php
- M external/scssphp/src/Version.php
- M framework/core/controllers/expController.php
- M framework/core/expFramework.php
- M framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/subsystems/expCSS.php
- M framework/core/subsystems/expHtmlToPDF.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/ecommerce/controllers/shippingController.php
- M framework/modules/ecommerce/models/billingcalculator.php
- M framework/modules/ecommerce/models/order.php
- M framework/modules/ecommerce/models/shippingcalculator.php
- M framework/modules/ecommerce/products/views/eventregistration/cartSummary.tpl
- M framework/modules/ecommerce/products/views/product/addToOrder.tpl
- M framework/modules/ecommerce/products/views/product/cartSummary.tpl
- M framework/modules/ecommerce/shippingcalculators/easypostcalculator.php
- M framework/modules/ecommerce/shippingcalculators/tablebasedcalculator.php
- M framework/modules/ecommerce/shippingcalculators/views/easypostcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/easypostcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/editspeed.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.bootstrap3.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.tpl
- M framework/modules/ecommerce/views/order/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/events/controllers/eventController.php
- M framework/modules/facebook/controllers/facebookController.php
- M framework/modules/file/connector/help.js
- M framework/modules/file/connector/i18n/elfinder.cs.js
- M framework/modules/file/connector/i18n/elfinder.de.js
- M framework/modules/file/connector/i18n/elfinder.en.js
- M framework/modules/file/connector/i18n/elfinder.es.js
- M framework/modules/file/connector/info.js
- M framework/modules/file/connector/open.js
- M framework/modules/file/connector/quicklook.plugins.js
- M framework/modules/file/connector/resize.js
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/views/file/elfinder.tpl
- M framework/modules/filedownloads/controllers/filedownloadController.php
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/news/controllers/newsController.php
- M framework/modules/socialfeed/assets/css/notes.css
- M framework/modules/socialfeed/controllers/socialfeedController.php
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/modules/text/views/text/showall_inline.bootstrap3.tpl
- M framework/modules/text/views/text/showall_inline.tpl
- M framework/plugins/function.breadcrumb.php
- M framework/plugins/function.google_map.php
- M readme-ical.txt
- M themes/bootstrap3theme/config.php
- M themes/simpletheme/class.php
- M themes/simpletheme/config_Fall.php
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS