Changeset [a171a6429d8aedfe0bcca73507999fdda40212a6] by dleffler
Revision a171a6429d8aedfe0bcca73507999fdda40212a6,
committed by dleffler
· June 14th, 2016 @ 09:36 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/a171a6429d8aedfe...
183 changed files
-
A
external/adminer/adminer-4.2.5-mysql.php -
A
external/easypost-php-3.1.0/CHANGELOG -
A
external/easypost-php-3.1.0/LICENSE -
A
external/easypost-php-3.1.0/README.md -
A
external/easypost-php-3.1.0/VERSION -
A
external/easypost-php-3.1.0/lib/EasyPost/Address.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Batch.php -
A
external/easypost-php-3.1.0/lib/EasyPost/CarrierAccount.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Container.php -
A
external/easypost-php-3.1.0/lib/EasyPost/CustomsInfo.php -
A
external/easypost-php-3.1.0/lib/EasyPost/CustomsItem.php -
A
external/easypost-php-3.1.0/lib/EasyPost/EasyPost.php -
A
external/easypost-php-3.1.0/lib/EasyPost/EasypostResource.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Error.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Event.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Fee.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Item.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Object.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Order.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Parcel.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Pickup.php -
A
external/easypost-php-3.1.0/lib/EasyPost/PostageLabel.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Rate.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Refund.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Requestor.php -
A
external/easypost-php-3.1.0/lib/EasyPost/ScanForm.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Shipment.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Tracker.php -
A
external/easypost-php-3.1.0/lib/EasyPost/User.php -
A
external/easypost-php-3.1.0/lib/EasyPost/Util.php -
A
external/easypost-php-3.1.0/lib/cacert.pem -
A
external/easypost-php-3.1.0/lib/easypost.php -
A
framework/modules/forms/assets/less/designer.less -
A
framework/modules/forms/assets/less/designer_bs3.less -
A
framework/modules/forms/views/forms/design_form.bootstrap3.tpl -
R
external/adminer/adminer-4.2.4-mysql.php -
R
external/easypost-php-3.0.3/CHANGELOG -
R
external/easypost-php-3.0.3/LICENSE -
R
external/easypost-php-3.0.3/README.md -
R
external/easypost-php-3.0.3/VERSION -
R
external/easypost-php-3.0.3/lib/EasyPost/Address.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Batch.php -
R
external/easypost-php-3.0.3/lib/EasyPost/CarrierAccount.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Container.php -
R
external/easypost-php-3.0.3/lib/EasyPost/CustomsInfo.php -
R
external/easypost-php-3.0.3/lib/EasyPost/CustomsItem.php -
R
external/easypost-php-3.0.3/lib/EasyPost/EasyPost.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Error.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Event.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Fee.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Item.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Object.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Order.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Parcel.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Pickup.php -
R
external/easypost-php-3.0.3/lib/EasyPost/PostageLabel.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Rate.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Refund.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Requestor.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Resource.php -
R
external/easypost-php-3.0.3/lib/EasyPost/ScanForm.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Shipment.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Tracker.php -
R
external/easypost-php-3.0.3/lib/EasyPost/User.php -
R
external/easypost-php-3.0.3/lib/EasyPost/Util.php -
R
external/easypost-php-3.0.3/lib/cacert.pem -
R
external/easypost-php-3.0.3/lib/easypost.php -
R
external/jquery/addons/js/shims/styles/shim-ext.css -
R
external/jquery/addons/js/shims/styles/shim.css -
M
exponent.js.php -
M
exponent_constants.php -
M
external/ExtPrograms.csv -
M
external/adminer/admin.php -
M
external/adminer/plugins/ckeditor.php -
M
external/adminer/plugins/convention-foreign-keys.php -
M
external/adminer/plugins/tinymce.php -
M
external/editors/tinymce/changelog.txt -
M
external/editors/tinymce/plugins/charmap/plugin.min.js -
M
external/editors/tinymce/plugins/imagetools/plugin.min.js -
M
external/editors/tinymce/plugins/legacyoutput/plugin.min.js -
M
external/editors/tinymce/plugins/media/plugin.min.js -
M
external/editors/tinymce/plugins/table/plugin.min.js -
M
external/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg -
M
external/editors/tinymce/skins/lightgray/skin.ie7.min.css -
M
external/editors/tinymce/skins/lightgray/skin.min.css -
M
external/editors/tinymce/tinymce.min.js -
M
external/jquery/addons/js/Sortable.js -
M
external/jquery/addons/js/bootstrap-tagsinput.js -
M
external/minify/min/config.php -
M
external/webshim-1.15.10/js-webshim/dev/polyfiller.js -
M
framework/core/controllers/expController.php -
M
framework/core/forms/controls/bootstrap/checkboxcontrol.php -
M
framework/core/forms/controls/bootstrap/datetimecontrol.php -
M
framework/core/forms/controls/bootstrap/dropdowncontrol.php -
M
framework/core/forms/controls/bootstrap/filemanagercontrol.php -
M
framework/core/forms/controls/bootstrap/genericcontrol.php -
M
framework/core/forms/controls/bootstrap/radiocontrol.php -
M
framework/core/forms/controls/bootstrap/textcontrol.php -
M
framework/core/forms/controls/bootstrap/uploadcontrol.php -
M
framework/core/forms/controls/bootstrap3/calendarcontrol.php -
M
framework/core/forms/controls/bootstrap3/checkboxcontrol.php -
M
framework/core/forms/controls/bootstrap3/ckeditorcontrol.php -
M
framework/core/forms/controls/bootstrap3/datetimecontrol.php -
M
framework/core/forms/controls/bootstrap3/dropdowncontrol.php -
M
framework/core/forms/controls/bootstrap3/filemanagercontrol.php -
M
framework/core/forms/controls/bootstrap3/listbuildercontrol.php -
M
framework/core/forms/controls/bootstrap3/popupdatetimecontrol.php -
M
framework/core/forms/controls/bootstrap3/radiocontrol.php -
M
framework/core/forms/controls/bootstrap3/radiogroupcontrol.php -
M
framework/core/forms/controls/bootstrap3/tinymcecontrol.php -
M
framework/core/forms/controls/bootstrap3/uploadcontrol.php -
M
framework/core/forms/controls/bootstrap3/yuicalendarcontrol.php -
M
framework/core/forms/controls/bootstrap3/yuidatetimecontrol.php -
M
framework/core/forms/controls/calendarcontrol.php -
M
framework/core/forms/controls/checkboxcontrol.php -
M
framework/core/forms/controls/countrycontrol.php -
M
framework/core/forms/controls/datetimecontrol.php -
M
framework/core/forms/controls/dropdowncontrol.php -
M
framework/core/forms/controls/filemanagercontrol.php -
M
framework/core/forms/controls/genericcontrol.php -
M
framework/core/forms/controls/hiddenfieldcontrol.php -
M
framework/core/forms/controls/htmlcontrol.php -
M
framework/core/forms/controls/jquery/calendarcontrol.php -
M
framework/core/forms/controls/jquery/listbuildercontrol.php -
M
framework/core/forms/controls/jquery/popupdatetimecontrol.php -
M
framework/core/forms/controls/jquery/yuicalendarcontrol.php -
M
framework/core/forms/controls/jquery/yuidatetimecontrol.php -
M
framework/core/forms/controls/listbuildercontrol.php -
M
framework/core/forms/controls/newui/checkboxcontrol.php -
M
framework/core/forms/controls/newui/datetimecontrol.php -
M
framework/core/forms/controls/newui/dropdowncontrol.php -
M
framework/core/forms/controls/newui/filemanagercontrol.php -
M
framework/core/forms/controls/newui/genericcontrol.php -
M
framework/core/forms/controls/newui/radiocontrol.php -
M
framework/core/forms/controls/newui/radiogroupcontrol.php -
M
framework/core/forms/controls/pagecontrol.php -
M
framework/core/forms/controls/popupdatetimecontrol.php -
M
framework/core/forms/controls/radiocontrol.php -
M
framework/core/forms/controls/radiogroupcontrol.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/uploadcontrol.php -
M
framework/core/forms/controls/yuicalendarcontrol.php -
M
framework/core/forms/controls/yuidatetimecontrol.php -
M
framework/core/forms/fakeform.php -
M
framework/core/forms/form.php -
M
framework/core/subsystems/expCSS.php -
M
framework/core/subsystems/expTheme.php -
M
framework/modules/administration/controllers/administrationController.php -
M
framework/modules/common/views/configure/module.bootstrap3.tpl -
M
framework/modules/common/views/configure/module.newui.tpl -
M
framework/modules/container/views/container/edit.bootstrap3.tpl -
M
framework/modules/container/views/container/edit.newui.tpl -
M
framework/modules/ecommerce/controllers/eventregistrationController.php -
M
framework/modules/ecommerce/controllers/storeController.php -
M
framework/modules/ecommerce/shippingcalculators/easypostcalculator.php -
M
framework/modules/ecommerce/views/eventregistration/month.tpl -
M
framework/modules/ecommerce/views/store/month.tpl -
M
framework/modules/events/controllers/eventController.php -
M
framework/modules/events/models/event.php -
M
framework/modules/events/views/event/minical.tpl -
M
framework/modules/events/views/event/month.tpl -
M
framework/modules/events/views/event/showall_Administration.tpl -
M
framework/modules/events/views/event/showall_Past Events.tpl -
M
framework/modules/file/connector/ckeditor_link.php -
M
framework/modules/file/connector/links.js -
M
framework/modules/file/views/file/elfinder.tpl -
M
framework/modules/file/views/file/picker_cke.tpl -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/forms/models/forms_control.php -
M
framework/modules/forms/views/forms/design_form.tpl -
M
framework/modules/forms/views/forms/edit_control.tpl -
M
framework/modules/navigation/views/navigation/manage_hierarchy.newui.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
framework/plugins/block.form.php -
M
framework/plugins/bootstrap/block.pop.php -
M
framework/plugins/bootstrap3/function.ddrerank.php -
M
framework/plugins/newui/block.form.php -
M
install/upgrades/remove_oldfiles.php -
M
themes/bootstrap3theme/less/bootstraptheme.less