Changeset [60c7cd533d8937773ada5c4cc10e5aaa49eeffe6] by dleffler
Revision 60c7cd533d8937773ada5c4cc10e5aaa49eeffe6,
committed by dleffler
· March 3rd, 2017 @ 02:08 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/60c7cd533d893777...
268 changed files
-
A
external/easypost-php-3.3.3/CHANGELOG -
A
external/easypost-php-3.3.3/LICENSE -
A
external/easypost-php-3.3.3/README.md -
A
external/easypost-php-3.3.3/VERSION -
A
external/easypost-php-3.3.3/lib/EasyPost/Address.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Batch.php -
A
external/easypost-php-3.3.3/lib/EasyPost/CarrierAccount.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Container.php -
A
external/easypost-php-3.3.3/lib/EasyPost/CustomsInfo.php -
A
external/easypost-php-3.3.3/lib/EasyPost/CustomsItem.php -
A
external/easypost-php-3.3.3/lib/EasyPost/EasyPost.php -
A
external/easypost-php-3.3.3/lib/EasyPost/EasypostResource.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Error.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Event.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Fee.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Insurance.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Item.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Object.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Order.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Parcel.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Pickup.php -
A
external/easypost-php-3.3.3/lib/EasyPost/PostageLabel.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Rate.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Refund.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Report.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Requestor.php -
A
external/easypost-php-3.3.3/lib/EasyPost/ScanForm.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Shipment.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Tracker.php -
A
external/easypost-php-3.3.3/lib/EasyPost/User.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Util.php -
A
external/easypost-php-3.3.3/lib/EasyPost/Webhook.php -
A
external/easypost-php-3.3.3/lib/cacert.pem -
A
external/easypost-php-3.3.3/lib/easypost.php -
A
external/editors/tinymce/skins/lightgray/skin.json -
A
external/mediaelement/build/lang/ca.js -
A
external/mediaelement/build/lang/cs.js -
A
external/mediaelement/build/lang/de.js -
A
external/mediaelement/build/lang/es.js -
A
external/mediaelement/build/lang/fr.js -
A
external/mediaelement/build/lang/hr.js -
A
external/mediaelement/build/lang/hu.js -
A
external/mediaelement/build/lang/it.js -
A
external/mediaelement/build/lang/ja.js -
A
external/mediaelement/build/lang/ko.js -
A
external/mediaelement/build/lang/nl.js -
A
external/mediaelement/build/lang/pl.js -
A
external/mediaelement/build/lang/pt-br.js -
A
external/mediaelement/build/lang/pt.js -
A
external/mediaelement/build/lang/ro.js -
A
external/mediaelement/build/lang/ru.js -
A
external/mediaelement/build/lang/sk.js -
A
external/mediaelement/build/lang/sv.js -
A
external/mediaelement/build/lang/uk.js -
A
external/mediaelement/build/lang/zh-cn.js -
A
external/mediaelement/build/lang/zh.js -
A
external/mediaelement/build/mediaelement-flash-audio-ogg.swf -
A
external/mediaelement/build/mediaelement-flash-audio.swf -
A
external/mediaelement/build/mediaelement-flash-video-hls.swf -
A
external/mediaelement/build/mediaelement-flash-video-mdash.swf -
A
external/mediaelement/build/mediaelement-flash-video.swf -
A
external/mediaelement/build/mediaelementplayer-legacy.css -
A
external/mediaelement/build/mediaelementplayer-legacy.min.css -
A
external/mediaelement/build/mejs-controls.png -
A
external/mediaelement/build/mejs-controls.svg -
A
external/mediaelement/build/renderers/dailymotion.js -
A
external/mediaelement/build/renderers/dailymotion.min.js -
A
external/mediaelement/build/renderers/facebook.js -
A
external/mediaelement/build/renderers/facebook.min.js -
A
external/mediaelement/build/renderers/soundcloud.js -
A
external/mediaelement/build/renderers/soundcloud.min.js -
A
external/mediaelement/build/renderers/twitch.js -
A
external/mediaelement/build/renderers/twitch.min.js -
A
external/mediaelement/build/renderers/vimeo.js -
A
external/mediaelement/build/renderers/vimeo.min.js -
A
external/mediaelement/plugins/ads-vast/ads-vast.js -
A
external/mediaelement/plugins/ads-vast/ads-vast.min.js -
A
external/mediaelement/plugins/ads/ads-i18n.js -
A
external/mediaelement/plugins/ads/ads.css -
A
external/mediaelement/plugins/ads/ads.js -
A
external/mediaelement/plugins/ads/ads.min.css -
A
external/mediaelement/plugins/ads/ads.min.js -
A
external/mediaelement/plugins/context-menu/context-menu-i18n.js -
A
external/mediaelement/plugins/context-menu/context-menu.css -
A
external/mediaelement/plugins/context-menu/context-menu.js -
A
external/mediaelement/plugins/context-menu/context-menu.min.css -
A
external/mediaelement/plugins/context-menu/context-menu.min.js -
A
external/mediaelement/plugins/google-analytics/google-analytics.js -
A
external/mediaelement/plugins/google-analytics/google-analytics.min.js -
A
external/mediaelement/plugins/jump-forward/jump-forward-i18n.js -
A
external/mediaelement/plugins/jump-forward/jump-forward.css -
A
external/mediaelement/plugins/jump-forward/jump-forward.js -
A
external/mediaelement/plugins/jump-forward/jump-forward.min.css -
A
external/mediaelement/plugins/jump-forward/jump-forward.min.js -
A
external/mediaelement/plugins/loop/loop-i18n.js -
A
external/mediaelement/plugins/loop/loop.css -
A
external/mediaelement/plugins/loop/loop.js -
A
external/mediaelement/plugins/loop/loop.min.css -
A
external/mediaelement/plugins/loop/loop.min.js -
A
external/mediaelement/plugins/markers/markers.js -
A
external/mediaelement/plugins/markers/markers.min.js -
A
external/mediaelement/plugins/postroll/postroll-i18n.js -
A
external/mediaelement/plugins/postroll/postroll.css -
A
external/mediaelement/plugins/postroll/postroll.js -
A
external/mediaelement/plugins/postroll/postroll.min.css -
A
external/mediaelement/plugins/postroll/postroll.min.js -
A
external/mediaelement/plugins/preview/preview.js -
A
external/mediaelement/plugins/preview/preview.min.js -
A
external/mediaelement/plugins/skip-back/skip-back-i18n.js -
A
external/mediaelement/plugins/skip-back/skip-back.css -
A
external/mediaelement/plugins/skip-back/skip-back.js -
A
external/mediaelement/plugins/skip-back/skip-back.min.css -
A
external/mediaelement/plugins/skip-back/skip-back.min.js -
A
external/mediaelement/plugins/source-chooser/source-chooser-i18n.js -
A
external/mediaelement/plugins/source-chooser/source-chooser.css -
A
external/mediaelement/plugins/source-chooser/source-chooser.js -
A
external/mediaelement/plugins/source-chooser/source-chooser.min.css -
A
external/mediaelement/plugins/source-chooser/source-chooser.min.js -
A
external/mediaelement/plugins/speed/speed-i18n.js -
A
external/mediaelement/plugins/speed/speed.css -
A
external/mediaelement/plugins/speed/speed.js -
A
external/mediaelement/plugins/speed/speed.min.css -
A
external/mediaelement/plugins/speed/speed.min.js -
A
external/mediaelement/plugins/stop/stop-i18n.js -
A
external/mediaelement/plugins/stop/stop.css -
A
external/mediaelement/plugins/stop/stop.js -
A
external/mediaelement/plugins/stop/stop.min.css -
A
external/mediaelement/plugins/stop/stop.min.js -
R
external/easypost-php-3.2.1/CHANGELOG -
R
external/easypost-php-3.2.1/LICENSE -
R
external/easypost-php-3.2.1/README.md -
R
external/easypost-php-3.2.1/VERSION -
R
external/easypost-php-3.2.1/lib/EasyPost/Address.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Batch.php -
R
external/easypost-php-3.2.1/lib/EasyPost/CarrierAccount.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Container.php -
R
external/easypost-php-3.2.1/lib/EasyPost/CustomsInfo.php -
R
external/easypost-php-3.2.1/lib/EasyPost/CustomsItem.php -
R
external/easypost-php-3.2.1/lib/EasyPost/EasyPost.php -
R
external/easypost-php-3.2.1/lib/EasyPost/EasypostResource.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Error.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Event.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Fee.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Insurance.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Item.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Object.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Order.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Parcel.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Pickup.php -
R
external/easypost-php-3.2.1/lib/EasyPost/PostageLabel.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Rate.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Refund.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Report.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Requestor.php -
R
external/easypost-php-3.2.1/lib/EasyPost/ScanForm.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Shipment.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Tracker.php -
R
external/easypost-php-3.2.1/lib/EasyPost/User.php -
R
external/easypost-php-3.2.1/lib/EasyPost/Util.php -
R
external/easypost-php-3.2.1/lib/cacert.pem -
R
external/easypost-php-3.2.1/lib/easypost.php -
M
external/ExtPrograms.csv -
M
external/editors/tinymce/changelog.txt -
M
external/editors/tinymce/jquery.tinymce.min.js -
M
external/editors/tinymce/plugins/advlist/plugin.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/autoresize/plugin.min.js -
M
external/editors/tinymce/plugins/autosave/plugin.min.js -
M
external/editors/tinymce/plugins/charmap/plugin.min.js -
M
external/editors/tinymce/plugins/fullpage/plugin.min.js -
M
external/editors/tinymce/plugins/fullscreen/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/insertdatetime/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/quickupload/plupload.full.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/tabfocus/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/plugins/textcolor/plugin.min.js -
M
external/editors/tinymce/plugins/textpattern/plugin.min.js -
M
external/editors/tinymce/plugins/toc/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/themes/inlite/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/cwd.css -
M
external/elFinder/js/commands/download.js -
M
external/elFinder/js/commands/help.js -
M
external/elFinder/js/commands/netmount.js -
M
external/elFinder/js/commands/open.js -
M
external/elFinder/js/commands/reload.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.options.netmount.js -
M
external/elFinder/js/elFinder.version.js -
M
external/elFinder/js/i18n/elfinder.cs.js -
M
external/elFinder/js/i18n/elfinder.de.js -
M
external/elFinder/js/i18n/elfinder.sk.js -
M
external/elFinder/js/i18n/elfinder.zh_CN.js -
M
external/elFinder/js/proxy/elFinderSupportVer1.js -
M
external/elFinder/js/ui/navbar.js -
M
external/elFinder/js/ui/workzone.js -
M
external/elFinder/php/elFinder.class.php -
M
external/elFinder/php/elFinderVolumeDriver.class.php -
M
external/elFinder/php/elFinderVolumeLocalFileSystem.class.php -
M
external/jquery/addons/js/Sortable.js -
M
external/jquery/addons/js/bootstrap-datetimepicker.js -
M
external/jquery/addons/less/_bootstrap-datetimepicker.less -
M
external/less.php/README.md -
M
external/less.php/lessc.inc.php -
M
external/less.php/lib/Less/Cache.php -
M
external/less.php/lib/Less/Functions.php -
M
external/less.php/lib/Less/Parser.php -
M
external/less.php/lib/Less/Tree/Call.php -
M
external/less.php/lib/Less/Tree/Import.php -
M
external/less.php/lib/Less/Tree/Ruleset.php -
M
external/less.php/lib/Less/Version.php -
M
external/less.php/lib/Less/Visitor/processExtends.php -
M
external/mediaelement/README.md -
M
external/mediaelement/build/mediaelement-and-player.js -
M
external/mediaelement/build/mediaelement-and-player.min.js -
M
external/mediaelement/build/mediaelement.js -
M
external/mediaelement/build/mediaelement.min.js -
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/changelog.md -
M
framework/core/controllers/expController.php -
M
framework/core/expFramework.php -
M
framework/core/forms/controls/bootstrap/tagpickercontrol.php -
M
framework/core/forms/controls/jquery/tagpickercontrol.php -
M
framework/core/forms/controls/jquery/tagtreecontrol.php -
M
framework/core/forms/controls/tagpickercontrol.php -
M
framework/core/forms/controls/tagtreecontrol.php -
M
framework/core/subsystems/expCSS.php -
M
framework/core/subsystems/expHistory.php -
M
framework/core/subsystems/expMail.php -
M
framework/core/subsystems/expSession.php -
M
framework/core/subsystems/expTheme.php -
M
framework/modules/administration/menus/y-navigation.php -
M
framework/modules/blog/controllers/blogController.php -
M
framework/modules/core/controllers/expTagController.php -
M
framework/modules/ecommerce/controllers/cartController.php -
M
framework/modules/ecommerce/shippingcalculators/easypostcalculator.php -
M
framework/modules/file/connector/elFinderVolumeExponent.class.php -
M
framework/modules/file/connector/elfinder.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/open.js -
M
framework/modules/file/models/expFile.php -
M
framework/modules/forms/controllers/formsController.php -
M
install/upgrades/remove_oldfiles.php -
M
selector.php