Changeset [2d61311b39286a7a0a10ede581f721f2c325d0ed] by dleffler
April 11th, 2017 @ 03:13 PM
Merge branch 'develop'
Conflicts:
phpdoc.xml
https://github.com/exponentcms/exponent-cms/commit/2d61311b39286a7a...
Committed by dleffler
- A external/adminer/adminer-4.3.0-mysql.php
- A external/adminer/plugins/AdminerSerializedPreview.php
- A external/adminer/plugins/struct-comments.php
- A external/adminer/plugins/table-indexes-structure.php
- A external/adminer/plugins/table-structure.php
- A external/mediaelement/plugins/ads-vast-vpaid/ads-vast-vpaid.js
- A external/mediaelement/plugins/ads-vast-vpaid/ads-vast-vpaid.min.js
- A framework/modules/socialfeed/assets/css/notes.css
- R external/mediaelement/build/background.png
- R external/mediaelement/build/bigplay.fw.png
- R external/mediaelement/build/bigplay.png
- R external/mediaelement/build/bigplay.svg
- R external/mediaelement/build/controls.fw.png
- R external/mediaelement/build/controls.png
- R external/mediaelement/build/controls.svg
- R external/mediaelement/build/flashmediaelement-cdn.swf
- R external/mediaelement/build/flashmediaelement-debug.swf
- R external/mediaelement/build/flashmediaelement.swf
- R external/mediaelement/build/jumpforward.png
- R external/mediaelement/build/lang/me-i18n-locale-cs.js
- R external/mediaelement/build/lang/me-i18n-locale-de.js
- R external/mediaelement/build/lang/me-i18n-locale-en.js
- R external/mediaelement/build/lang/me-i18n-locale-es.js
- R external/mediaelement/build/lang/me-i18n-locale-fr.js
- R external/mediaelement/build/lang/me-i18n-locale-hu.js
- R external/mediaelement/build/lang/me-i18n-locale-it.js
- R external/mediaelement/build/lang/me-i18n-locale-ja.js
- R external/mediaelement/build/lang/me-i18n-locale-ko.js
- R external/mediaelement/build/lang/me-i18n-locale-nl.js
- R external/mediaelement/build/lang/me-i18n-locale-pl.js
- R external/mediaelement/build/lang/me-i18n-locale-pt-br.js
- R external/mediaelement/build/lang/me-i18n-locale-pt.js
- R external/mediaelement/build/lang/me-i18n-locale-ro.js
- R external/mediaelement/build/lang/me-i18n-locale-ru.js
- R external/mediaelement/build/lang/me-i18n-locale-sk.js
- R external/mediaelement/build/lang/me-i18n-locale-zh-cn.js
- R external/mediaelement/build/lang/me-i18n-locale-zh.js
- R external/mediaelement/build/loading.gif
- R external/mediaelement/build/silverlightmediaelement.xap
- R external/mediaelement/build/skipback.png
- M OPTIONAL.md
- M exponent_constants.php
- M external/ExtPrograms.csv
- M external/PEAR.php
- M external/ReCaptcha/ReCaptcha/ReCaptcha.php
- M external/ReCaptcha/ReCaptcha/RequestMethod/Post.php
- M external/ReCaptcha/ReCaptcha/RequestMethod/Socket.php
- M external/ReCaptcha/ReCaptcha/RequestMethod/SocketPost.php
- M external/ReCaptcha/ReCaptcha/Response.php
- M external/ReCaptcha/autoload.php
- M external/Tar.php
- M external/Zip.php
- M external/adminer/admin.php
- M external/adminer/plugins/ckeditor.php
- M external/adminer/plugins/edit-calendar.php
- M external/adminer/plugins/edit-foreign.php
- M external/adminer/plugins/edit-text-serialized.php
- M external/adminer/plugins/plugin.php
- M external/adminer/plugins/tinymce.php
- M external/editors/ckeditor/styles.js
- M external/editors/tinymce/changelog.txt
- M external/editors/tinymce/plugins/layer/plugin.min.js
- M external/editors/tinymce/plugins/spellchecker/plugin.min.js
- M external/editors/tinymce/tinymce.min.js
- M external/elFinder/Changelog
- M external/elFinder/README.md
- M external/elFinder/css/navbar.css
- M external/elFinder/js/commands/chmod.js
- M external/elFinder/js/commands/copy.js
- M external/elFinder/js/commands/cut.js
- M external/elFinder/js/commands/duplicate.js
- M external/elFinder/js/commands/edit.js
- M external/elFinder/js/commands/extract.js
- M external/elFinder/js/commands/fullscreen.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/mkfile.js
- M external/elFinder/js/commands/paste.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/elFinder.command.js
- M external/elFinder/js/elFinder.js
- M external/elFinder/js/elFinder.options.js
- M external/elFinder/js/elFinder.options.netmount.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/ui/button.js
- M external/elFinder/js/ui/contextmenu.js
- M external/elFinder/js/ui/cwd.js
- M external/elFinder/js/ui/places.js
- M external/elFinder/js/ui/searchbutton.js
- M external/elFinder/js/ui/stat.js
- M external/elFinder/js/ui/toolbar.js
- M external/elFinder/js/ui/tree.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/themes/windows-10/css/contextmenu.css
- 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/SimpleAjaxUploader.js
- M external/jquery/addons/js/bootstrap-dialog.js
- M external/jquery/addons/js/jstree.js
- M external/jquery/addons/js/moment.js
- M external/jquery/addons/js/owl.carousel.js
- M external/jquery/addons/js/themes/default-dark/style.css
- M external/jquery/addons/js/themes/default/style.css
- M external/less.php/lib/Less/Parser.php
- M external/less.php/lib/Less/Visitor/toCSS.php
- M external/mediaelement/README.md
- M external/mediaelement/build/lang/ca.js
- M external/mediaelement/build/lang/cs.js
- M external/mediaelement/build/lang/de.js
- M external/mediaelement/build/lang/es.js
- M external/mediaelement/build/lang/fr.js
- M external/mediaelement/build/lang/hr.js
- M external/mediaelement/build/lang/hu.js
- M external/mediaelement/build/lang/it.js
- M external/mediaelement/build/lang/ja.js
- M external/mediaelement/build/lang/ko.js
- M external/mediaelement/build/lang/nl.js
- M external/mediaelement/build/lang/pl.js
- M external/mediaelement/build/lang/pt-br.js
- M external/mediaelement/build/lang/pt.js
- M external/mediaelement/build/lang/ro.js
- M external/mediaelement/build/lang/ru.js
- M external/mediaelement/build/lang/sk.js
- M external/mediaelement/build/lang/sv.js
- M external/mediaelement/build/lang/uk.js
- M external/mediaelement/build/lang/zh-cn.js
- M external/mediaelement/build/lang/zh.js
- M external/mediaelement/build/mediaelement-and-player.js
- M external/mediaelement/build/mediaelement-and-player.min.js
- M external/mediaelement/build/mediaelement-flash-video.swf
- M external/mediaelement/build/mediaelement.js
- M external/mediaelement/build/mediaelement.min.js
- M external/mediaelement/build/mediaelementplayer-legacy.css
- M external/mediaelement/build/mediaelementplayer-legacy.min.css
- M external/mediaelement/build/mediaelementplayer.css
- M external/mediaelement/build/mediaelementplayer.js
- M external/mediaelement/build/mediaelementplayer.min.css
- M external/mediaelement/build/mediaelementplayer.min.js
- M external/mediaelement/build/renderers/dailymotion.js
- M external/mediaelement/build/renderers/dailymotion.min.js
- M external/mediaelement/build/renderers/facebook.js
- M external/mediaelement/build/renderers/facebook.min.js
- M external/mediaelement/build/renderers/soundcloud.js
- M external/mediaelement/build/renderers/soundcloud.min.js
- M external/mediaelement/build/renderers/twitch.js
- M external/mediaelement/build/renderers/twitch.min.js
- M external/mediaelement/build/renderers/vimeo.js
- M external/mediaelement/build/renderers/vimeo.min.js
- M external/mediaelement/changelog.md
- M external/mediaelement/plugins/ads-vast/ads-vast.js
- M external/mediaelement/plugins/ads-vast/ads-vast.min.js
- M external/mediaelement/plugins/ads/ads.js
- M external/mediaelement/plugins/ads/ads.min.js
- M external/mediaelement/plugins/context-menu/context-menu.js
- M external/mediaelement/plugins/context-menu/context-menu.min.js
- M external/mediaelement/plugins/jump-forward/jump-forward.js
- M external/mediaelement/plugins/jump-forward/jump-forward.min.js
- M external/mediaelement/plugins/loop/loop.js
- M external/mediaelement/plugins/loop/loop.min.js
- M external/mediaelement/plugins/markers/markers.js
- M external/mediaelement/plugins/markers/markers.min.js
- M external/mediaelement/plugins/postroll/postroll.js
- M external/mediaelement/plugins/postroll/postroll.min.js
- M external/mediaelement/plugins/preview/preview.js
- M external/mediaelement/plugins/preview/preview.min.js
- M external/mediaelement/plugins/skip-back/skip-back.js
- M external/mediaelement/plugins/skip-back/skip-back.min.js
- M external/mediaelement/plugins/source-chooser/source-chooser.css
- M external/mediaelement/plugins/source-chooser/source-chooser.js
- M external/mediaelement/plugins/source-chooser/source-chooser.min.css
- M external/mediaelement/plugins/source-chooser/source-chooser.min.js
- M external/mediaelement/plugins/speed/speed.js
- M external/mediaelement/plugins/speed/speed.min.js
- M external/mediaelement/plugins/stop/stop.js
- M external/mediaelement/plugins/stop/stop.min.js
- M external/normalize/normalize.css
- M external/translate/bingapi.php
- M framework/conf/extensions/error.defaults.php
- M framework/conf/extensions/htmltopdf.defaults.php
- M framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
- M framework/core/forms/controls/bootstrap3/tinymcecontrol.php
- M framework/core/forms/controls/ckeditorcontrol.php
- M framework/core/forms/controls/countryregioncontrol.php
- M framework/core/forms/controls/tinymcecontrol.php
- M framework/core/models/expConfig.php
- M framework/core/subsystems/expDateTime.php
- M framework/core/subsystems/expHtmlToPDF.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/modules/addressbook/controllers/addressController.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/views/administration/configure_site.bootstrap3.tpl
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/core/views/expHTMLEditor/edit.tpl
- M framework/modules/eaas/controllers/eaasController.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/views/ecomconfig/configure.bootstrap3.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.tpl
- M framework/modules/ecommerce/views/order/showall.bootstrap3.tpl
- M framework/modules/ecommerce/views/order/showall.tpl
- M framework/modules/ecommerce/views/store/manage.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/manage.tpl
- M framework/modules/events/views/event/month.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/quicklook.plugins.js
- M framework/modules/file/connector/resize.js
- M framework/modules/file/views/file/elfinder.tpl
- M framework/modules/file/views/file/picker_cke.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/help/controllers/helpController.php
- M framework/modules/mediaplayer/views/media/showall.bootstrap3.tpl
- M framework/modules/mediaplayer/views/media/showall.tpl
- M framework/modules/report/controllers/reportController.php
- M framework/modules/report/views/report/generateOrderReport.bootstrap3.tpl
- M framework/modules/report/views/report/generateOrderReport.tpl
- M framework/modules/report/views/report/generateProductReport.bootstrap3.tpl
- M framework/modules/report/views/report/generateProductReport.tpl
- M framework/modules/socialfeed/assets/less/socialfeed.less
- M framework/modules/socialfeed/controllers/socialfeedController.php
- M framework/modules/socialfeed/views/socialfeed/configure/socialfeed.tpl
- M framework/modules/socialfeed/views/socialfeed/showall.bootstrap3.tpl
- M framework/plugins/function.google_map.php
- M install/upgrades/update_ecom3.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