Changeset [8c43ca7dc1ff71e0bf1650916c7f48749d69bf25] by dleffler
Revision 8c43ca7dc1ff71e0bf1650916c7f48749d69bf25,
committed by dleffler
· June 3rd, 2016 @ 01:47 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/8c43ca7dc1ff71e0...
102 changed files
-
A
external/elFinder/js/i18n/elfinder.hr.js -
A
external/elFinder/php/autoload.php -
A
framework/modules/file/connector/i18n/elfinder.pt.js -
A
install/upgrades/remove_empty_tags.php -
R
framework/modules/file/connector/i18n/elfinder.pt_BR.js -
R
framework/modules/pixidou/download.php -
R
framework/modules/pixidou/upload.php -
M
external/ExtPrograms.csv -
M
external/adminer/admin.php -
M
external/adminer/plugins/tables-filter.php -
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/quicklook.css -
M
external/elFinder/css/statusbar.css -
M
external/elFinder/css/toolbar.css -
M
external/elFinder/img/toolbar.png -
M
external/elFinder/js/commands/archive.js -
M
external/elFinder/js/commands/chmod.js -
M
external/elFinder/js/commands/download.js -
M
external/elFinder/js/commands/getfile.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/open.js -
M
external/elFinder/js/commands/pixlr.js -
M
external/elFinder/js/commands/quicklook.js -
M
external/elFinder/js/commands/quicklook.plugins.js -
M
external/elFinder/js/commands/reload.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/sort.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/i18n/elfinder.en.js -
M
external/elFinder/js/i18n/elfinder.jp.js -
M
external/elFinder/js/i18n/elfinder.pt_BR.js -
M
external/elFinder/js/jquery.elfinder.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/navbar.js -
M
external/elFinder/js/ui/overlay.js -
M
external/elFinder/js/ui/path.js -
M
external/elFinder/js/ui/places.js -
M
external/elFinder/js/ui/searchbutton.js -
M
external/elFinder/js/ui/sortbutton.js -
M
external/elFinder/js/ui/toolbar.js -
M
external/elFinder/js/ui/tree.js -
M
external/elFinder/js/ui/workzone.js -
M
external/elFinder/php/elFinder.class.php -
M
external/elFinder/php/elFinderConnector.class.php -
M
external/elFinder/php/elFinderSession.php -
M
external/elFinder/php/elFinderVolumeDriver.class.php -
M
external/elFinder/php/elFinderVolumeLocalFileSystem.class.php -
M
external/elFinder/php/plugins/AutoResize/plugin.php -
M
external/elFinder/php/plugins/AutoRotate/plugin.php -
M
external/elFinder/php/plugins/Normalizer/plugin.php -
M
external/elFinder/php/plugins/Watermark/plugin.php -
M
external/elFinder/themes/moono/css/contextmenu.less -
M
external/elFinder/themes/moono/css/theme.css -
M
external/elFinder/themes/windows-10/css/contextmenu.css -
M
external/jquery/addons/css/owl.carousel.css -
M
external/jquery/addons/js/owl.carousel.js -
M
framework/core/assets/less/common.less -
M
framework/core/subsystems/expTheme.php -
M
framework/modules/administration/views/administration/install_upgrades_run.tpl -
M
framework/modules/common/views/configure/files.tpl -
M
framework/modules/eaas/controllers/eaasController.php -
M
framework/modules/eaas/views/eaas/configure/Blog.tpl -
M
framework/modules/eaas/views/eaas/configure/Events.tpl -
M
framework/modules/eaas/views/eaas/configure/File_Downloads.tpl -
M
framework/modules/eaas/views/eaas/configure/Media.tpl -
M
framework/modules/eaas/views/eaas/configure/News.tpl -
M
framework/modules/eaas/views/eaas/configure/Photo.tpl -
M
framework/modules/events/views/event/configure/reminders.tpl -
M
framework/modules/file/connector/help.js -
M
framework/modules/file/connector/i18n/elfinder.en.js -
M
framework/modules/file/connector/info.js -
M
framework/modules/file/connector/open.js -
M
framework/modules/file/connector/pixlr.js -
M
framework/modules/file/connector/quicklook.plugins.js -
M
framework/modules/file/connector/resize.js -
M
framework/modules/file/views/file/elfinder.tpl -
M
framework/modules/navigation/views/navigation/manage_sitemap.bootstrap.tpl -
M
framework/modules/navigation/views/navigation/manage_sitemap.bootstrap3.tpl -
M
framework/modules/navigation/views/navigation/manage_sitemap.tpl -
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
install/pages/upgrade-4.php -
M
install/upgrades/remove_oldfiles.php -
M
readme-ical.txt