Changeset [cd182d70ebcbe656db15093496aaf08206102f81] by dleffler
Revision cd182d70ebcbe656db15093496aaf08206102f81,
committed by dleffler
· March 16th, 2018 @ 07:06 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/cd182d70ebcbe656...
333 changed files
-
A
external/adminer/adminer-4.6.2-mysql.php -
A
external/elFinder/img/edit_ckeditor5.png -
A
external/elFinder/img/volume_icon_zip.png -
A
external/elFinder/js/extras/quicklook.googledocs.js -
A
external/elFinder/php/editors/ZipArchive/editor.php -
A
framework/core/printer-friendly.bootstrap4.php -
A
framework/modules/ecommerce/assets/css/ecom-bs4.css -
A
framework/modules/photoalbum/views/photo/configure/gallery.bootstrap.tpl -
A
framework/modules/report/views/report/stats.tpl -
A
install/upgrades/update_ecom5.php -
R
external/adminer/adminer-4.6.1-mysql.php -
M
exponent_constants.php -
M
external/ExtPrograms.csv -
M
external/adminer/admin.php -
M
external/adminer/css/default-blue.css -
M
external/adminer/css/default-green.css -
M
external/adminer/css/default-orange.css -
M
external/adminer/plugins/AdminerTheme.php -
M
external/adminer/plugins/plugin.php -
M
external/adminer/plugins/tables-filter.php -
M
external/editors/tinymce/changelog.txt -
M
external/editors/tinymce/jquery.tinymce.min.js -
M
external/editors/tinymce/plugins/anchor/plugin.min.js -
M
external/editors/tinymce/plugins/autolink/plugin.min.js -
M
external/editors/tinymce/plugins/contextmenu/plugin.min.js -
M
external/editors/tinymce/plugins/fullscreen/plugin.min.js -
M
external/editors/tinymce/plugins/help/plugin.min.js -
M
external/editors/tinymce/plugins/hr/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/link/plugin.min.js -
M
external/editors/tinymce/plugins/lists/plugin.min.js -
M
external/editors/tinymce/plugins/media/plugin.min.js -
M
external/editors/tinymce/plugins/paste/plugin.min.js -
M
external/editors/tinymce/plugins/preview/plugin.min.js -
M
external/editors/tinymce/plugins/print/plugin.min.js -
M
external/editors/tinymce/plugins/searchreplace/plugin.min.js -
M
external/editors/tinymce/plugins/spellchecker/plugin.min.js -
M
external/editors/tinymce/plugins/table/plugin.min.js -
M
external/editors/tinymce/plugins/template/plugin.min.js -
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/toolbar.css -
M
external/elFinder/img/arrows-active.png -
M
external/elFinder/img/arrows-normal.png -
M
external/elFinder/img/crop.gif -
M
external/elFinder/img/dialogs.png -
M
external/elFinder/img/edit_aceeditor.png -
M
external/elFinder/img/edit_ckeditor.png -
M
external/elFinder/img/edit_codemirror.png -
M
external/elFinder/img/edit_creativecloud.png -
M
external/elFinder/img/edit_pixlreditor.png -
M
external/elFinder/img/edit_pixlrexpress.png -
M
external/elFinder/img/edit_simplemde.png -
M
external/elFinder/img/edit_zohooffice.png -
M
external/elFinder/img/icons-big.png -
M
external/elFinder/img/icons-small.png -
M
external/elFinder/img/logo.png -
M
external/elFinder/img/progress.gif -
M
external/elFinder/img/quicklook-bg.png -
M
external/elFinder/img/quicklook-icons.png -
M
external/elFinder/img/spinner-mini.gif -
M
external/elFinder/img/toolbar.png -
M
external/elFinder/img/ui-icons_ffffff_256x240.png -
M
external/elFinder/img/volume_icon_dropbox.png -
M
external/elFinder/img/volume_icon_ftp.png -
M
external/elFinder/img/volume_icon_googledrive.png -
M
external/elFinder/img/volume_icon_local.png -
M
external/elFinder/img/volume_icon_onedrive.png -
M
external/elFinder/img/volume_icon_sql.png -
M
external/elFinder/img/volume_icon_trash.png -
M
external/elFinder/js/commands/chmod.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/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/search.js -
M
external/elFinder/js/commands/sort.js -
M
external/elFinder/js/commands/upload.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.bg.js -
M
external/elFinder/js/i18n/elfinder.en.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/jquery.dialogelfinder.js -
M
external/elFinder/js/jquery.elfinder.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/navbar.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/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/php/editors/ZohoOffice/editor.php -
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/Watermark/logo.png -
M
external/elFinder/php/plugins/Watermark/plugin.php -
M
external/elFinder/php/resources/image.png -
M
external/elFinder/php/resources/video.png -
M
external/jquery/addons/css/owl.carousel.css -
M
external/jquery/addons/css/owl.theme.default.css -
M
external/jquery/addons/css/owl.theme.green.css -
M
external/jquery/addons/js/moment.js -
M
external/jquery/addons/js/owl.carousel.js -
M
external/scssphp/src/Compiler.php -
M
framework/core/assets/less/forms-bootstrap3.less -
M
framework/core/controllers/expController.php -
M
framework/core/controllers/expNestedNodeController.php -
M
framework/core/expFramework.php -
M
framework/core/forms/controls/bootstrap/dropdowncontrol.php -
M
framework/core/forms/controls/bootstrap/filemanagercontrol.php -
M
framework/core/forms/controls/bootstrap/textcontrol.php -
M
framework/core/forms/controls/bootstrap3/ckeditorcontrol.php -
M
framework/core/forms/controls/bootstrap3/dropdowncontrol.php -
M
framework/core/forms/controls/bootstrap3/filemanagercontrol.php -
M
framework/core/forms/controls/bootstrap3/radiogroupcontrol.php -
M
framework/core/forms/controls/bootstrap3/tinymcecontrol.php -
M
framework/core/forms/controls/ckeditorcontrol.php -
M
framework/core/forms/controls/countrycontrol.php -
M
framework/core/forms/controls/dropdowncontrol.php -
M
framework/core/forms/controls/filemanagercontrol.php -
M
framework/core/forms/controls/htmleditorcontrol.php -
M
framework/core/forms/controls/jquery/tagtreecontrol.php -
M
framework/core/forms/controls/newui/dropdowncontrol.php -
M
framework/core/forms/controls/newui/filemanagercontrol.php -
M
framework/core/forms/controls/newui/radiogroupcontrol.php -
M
framework/core/forms/controls/pagecontrol.php -
M
framework/core/forms/controls/radiogroupcontrol.php -
M
framework/core/forms/controls/rangecontrol.php -
M
framework/core/forms/controls/statescontrol.php -
M
framework/core/forms/controls/textcontrol.php -
M
framework/core/forms/controls/texteditorcontrol.php -
M
framework/core/forms/controls/tinymcecontrol.php -
M
framework/core/forms/fakeform.php -
M
framework/core/forms/form.php -
M
framework/core/models/expNestedNode.php -
M
framework/core/models/expRecord.php -
M
framework/core/subsystems/database/mysqli.php -
M
framework/core/subsystems/database/postgres.php -
M
framework/core/subsystems/expCore.php -
M
framework/core/subsystems/expDatabase.php -
M
framework/core/subsystems/expDateTime.php -
M
framework/core/subsystems/expLabels.php -
M
framework/core/subsystems/expMail.php -
M
framework/core/subsystems/expPaginator.php -
M
framework/core/subsystems/expRouter.php -
M
framework/core/subsystems/expSession.php -
M
framework/core/subsystems/expSettings.php -
M
framework/core/subsystems/expString.php -
M
framework/core/subsystems/expTemplate.php -
M
framework/core/subsystems/expTheme.php -
M
framework/core/subsystems/expUtil.php -
M
framework/core/views/_msg_queue.bootstrap.tpl -
M
framework/modules/addressbook/assets/css/address.css -
M
framework/modules/addressbook/controllers/addressController.php -
M
framework/modules/administration/controllers/administrationController.php -
M
framework/modules/administration/menus/ecomm1.php -
M
framework/modules/blog/controllers/blogController.php -
M
framework/modules/blog/models/blog.php -
M
framework/modules/container/models/container.php -
M
framework/modules/core/controllers/expCommentController.php -
M
framework/modules/core/controllers/expDefinableFieldController.php -
M
framework/modules/core/controllers/expSimpleNoteController.php -
M
framework/modules/core/models/expSimpleNote.php -
M
framework/modules/eaas/controllers/eaasController.php -
M
framework/modules/ecommerce/assets/css/ecom-bs3.css -
M
framework/modules/ecommerce/billingcalculators/cash.php -
M
framework/modules/ecommerce/billingcalculators/paylater.php -
M
framework/modules/ecommerce/controllers/cartController.php -
M
framework/modules/ecommerce/controllers/eventregistrationController.php -
M
framework/modules/ecommerce/controllers/orderController.php -
M
framework/modules/ecommerce/controllers/storeCategoryController.php -
M
framework/modules/ecommerce/controllers/storeController.php -
M
framework/modules/ecommerce/models/billing.php -
M
framework/modules/ecommerce/models/order.php -
M
framework/modules/ecommerce/models/shipping.php -
M
framework/modules/ecommerce/models/storeCategory.php -
M
framework/modules/ecommerce/models/taxclass.php -
M
framework/modules/ecommerce/products/models/donation.php -
M
framework/modules/ecommerce/products/models/eventregistration.php -
M
framework/modules/ecommerce/products/models/product.php -
M
framework/modules/ecommerce/products/views/product/addToOrder.tpl -
M
framework/modules/ecommerce/shippingcalculators/peritemcalculator.php -
M
framework/modules/ecommerce/shippingcalculators/perweightcalculator.php -
M
framework/modules/ecommerce/shippingcalculators/tablebasedcalculator.php -
M
framework/modules/ecommerce/views/order/showall.bootstrap3.tpl -
M
framework/modules/ecommerce/views/store/manage.bootstrap3.tpl -
M
framework/modules/ecommerce/views/store/manage.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/events/models/event.php -
M
framework/modules/file/connector/content_linked.php -
M
framework/modules/file/connector/elFinderVolumeExponent.class.php -
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/quicklook.plugins.js -
M
framework/modules/file/connector/resize.js -
M
framework/modules/file/connector/uploader.php -
M
framework/modules/file/connector/uploader_paste.php -
M
framework/modules/file/connector/uploader_paste_tinymce.php -
M
framework/modules/file/connector/uploader_tinymce.php -
M
framework/modules/file/controllers/fileController.php -
M
framework/modules/file/models/expFile.php -
M
framework/modules/file/views/file/picker_cke.tpl -
M
framework/modules/file/views/file/uploader.tpl -
M
framework/modules/filedownloads/controllers/filedownloadController.php -
M
framework/modules/filedownloads/views/filedownload/filedownloaditem.tpl -
M
framework/modules/filedownloads/views/filedownload/show.tpl -
M
framework/modules/filedownloads/views/filedownload/showall.bootstrap3.tpl -
M
framework/modules/filedownloads/views/filedownload/showall.tpl -
M
framework/modules/filedownloads/views/filedownload/showall_accordion.bootstrap3.tpl -
M
framework/modules/filedownloads/views/filedownload/showall_accordion.tpl -
M
framework/modules/filedownloads/views/filedownload/showall_headlines.tpl -
M
framework/modules/filedownloads/views/filedownload/showall_recent.tpl -
M
framework/modules/filedownloads/views/filedownload/showall_tabbed.bootstrap3.tpl -
M
framework/modules/filedownloads/views/filedownload/showall_tabbed.tpl -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/forms/views/forms/design_form.bootstrap3.tpl -
M
framework/modules/forms/views/forms/design_form.tpl -
M
framework/modules/forms/views/forms/enterdata.tpl -
M
framework/modules/help/controllers/helpController.php -
M
framework/modules/help/models/help_version.php -
M
framework/modules/importexport/controllers/importexportController.php -
M
framework/modules/mediaplayer/views/media/configure/media.tpl -
M
framework/modules/mediaplayer/views/media/medialist.bootstrap3.tpl -
M
framework/modules/mediaplayer/views/media/medialist.tpl -
M
framework/modules/mediaplayer/views/media/showall.bootstrap3.tpl -
M
framework/modules/mediaplayer/views/media/showall.tpl -
M
framework/modules/motd/views/motd/showall_year.tpl -
M
framework/modules/navigation/controllers/navigationController.php -
M
framework/modules/navigation/models/sectionref.php -
M
framework/modules/navigation/views/navigation/showall_Expanding Hierarchy.tpl -
M
framework/modules/news/controllers/newsController.php -
M
framework/modules/photoalbum/views/photo/configure/gallery.bootstrap3.tpl -
M
framework/modules/photoalbum/views/photo/configure/gallery.tpl -
M
framework/modules/photoalbum/views/photo/configure/slideshow.bootstrap.config -
M
framework/modules/photoalbum/views/photo/configure/slideshow.bootstrap3.config -
M
framework/modules/photoalbum/views/photo/configure/slideshow.config -
M
framework/modules/photoalbum/views/photo/slideshow.bootstrap3.tpl -
M
framework/modules/pixidou/controllers/pixidouController.php -
M
framework/modules/report/controllers/reportController.php -
M
framework/modules/report/views/report/cart_summary.bootstrap3.tpl -
M
framework/modules/report/views/report/cart_summary.tpl -
M
framework/modules/report/views/report/dashboard.tpl -
M
framework/modules/report/views/report/generateOrderReport.bootstrap3.tpl -
M
framework/modules/report/views/report/generateOrderReport.tpl -
M
framework/modules/report/views/report/generate_report.bootstrap3.tpl -
M
framework/modules/report/views/report/generate_report.tpl -
M
framework/modules/report/views/report/menu.tpl -
M
framework/modules/report/views/report/payment_report.tpl -
M
framework/modules/report/views/report/product_report.bootstrap3.tpl -
M
framework/modules/report/views/report/product_report.tpl -
M
framework/modules/report/views/report/show_payment_summary.tpl -
M
framework/modules/search/controllers/searchController.php -
M
framework/modules/search/models/search.php -
M
framework/modules/simplepoll/controllers/simplePollController.php -
M
framework/modules/socialfeed/controllers/socialfeedController.php -
M
framework/modules/socialfeed/views/socialfeed/showall.bootstrap3.tpl -
M
framework/modules/twitter/models/Twitter.php -
M
framework/modules/users/controllers/usersController.php -
M
framework/modules/users/models/group.php -
M
framework/modules/users/models/user.php -
M
framework/plugins/block.form.php -
M
framework/plugins/bootstrap/function.icon.php -
M
framework/plugins/bootstrap3/function.icon.php -
M
framework/plugins/function.assign_adv.php -
M
framework/plugins/function.breadcrumb.php -
M
framework/plugins/function.get_user.php -
M
framework/plugins/function.google_map.php -
M
framework/plugins/function.google_maps_link.php -
M
framework/plugins/function.icon.php -
M
framework/plugins/function.img.php -
M
framework/plugins/function.stars.php -
M
framework/plugins/modifier.countryname.php -
M
framework/plugins/modifier.groupname.php -
M
framework/plugins/modifier.highlight.php -
M
framework/plugins/modifier.signature.php -
M
framework/plugins/modifier.statename.php -
M
framework/plugins/modifier.summarize.php -
M
framework/plugins/modifier.username.php -
M
framework/plugins/newui/function.icon.php -
M
install/include/sanity.php -
M
install/samples/church.eql -
M
install/upgrades/fix_sef_urls.php -
M
install/upgrades/remove_oldfiles.php -
M
install/upgrades/update_ecom3.php -
M
install/upgrades/update_ecom4.php -
M
install/upgrades/update_events.php -
M
selector.php -
M
themes/bootstraptheme/subthemes/Full Size.php -
M
themes/simpletheme/index.php -
M
themes/simpletheme/mobile/index.php -
M
themes/simpletheme/subthemes/Blog Sidebar.php -
M
themes/simpletheme/subthemes/Follow Parent.php -
M
themes/simpletheme/subthemes/Full Size.php -
M
themes/simpletheme/subthemes/Left Sectional.php -
M
thumb.php -
M
web.config -
M
xmlrpc.php