Changeset [152a28f1ea40e8dc8ea9209f1f2e7824dd59a569] by dleffler
January 21st, 2018 @ 10:04 PM
Merge branch 'develop'
Conflicts:
exponent_version.php
https://github.com/exponentcms/exponent-cms/commit/152a28f1ea40e8dc...
Committed by dleffler
- A external/adminer/adminer-4.4.0-mysql.php
- A external/jquery/addons/less/jquery-confirm.less
- A install/changes/2.4.3.txt
- A themes/bootstrap3theme/editors/ckeditor/config.js
- A web.config
- R external/adminer/adminer-4.3.1-mysql.php
- R external/editors/ckeditor/plugins/quicktable/package.json
- R external/jquery/addons/css/jquery.placeholder.css
- M CHANGELOG.md
- M CREDITS.md
- M INSTALLATION.md
- M OPTIONAL.md
- M RELEASE.md
- M TODO.md
- M cron/lang_extract.php
- M cron/lang_translate.php
- M cron/lang_update.php
- M exponent_constants.php
- M external/EmailValidator-2.1.2/EmailValidator/EmailValidator.php
- M external/ExtPrograms.csv
- M external/adminer/admin.php
- M external/adminer/adminer.css
- 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/AdminerJsonPreview.php
- M external/adminer/plugins/AdminerSerializedPreview.php
- M external/adminer/plugins/AdminerTheme.php
- M external/adminer/plugins/ckeditor.php
- M external/adminer/plugins/dump-bz2.php
- M external/adminer/plugins/dump-zip.php
- M external/adminer/plugins/edit-calendar.php
- M external/adminer/plugins/edit-foreign.php
- M external/adminer/plugins/edit-textarea.php
- M external/adminer/plugins/enum-option.php
- M external/adminer/plugins/plugin.php
- M external/adminer/plugins/struct-comments.php
- M external/adminer/plugins/table-indexes-structure.php
- M external/adminer/plugins/table-structure.php
- M external/adminer/plugins/tables-filter.php
- M external/adminer/plugins/tinymce.php
- M external/adminer/plugins/version-noverify.php
- M external/jquery/addons/js/jstree.js
- M external/mediaelement/build/mediaelement-and-player.js
- M external/mediaelement/build/mediaelement-and-player.min.js
- M external/mediaelement/build/mediaelement-flash-audio-ogg.swf
- M external/mediaelement/build/mediaelement-flash-audio.swf
- M external/mediaelement/build/mediaelement-flash-video-hls.swf
- M external/mediaelement/build/mediaelement-flash-video-mdash.swf
- 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/renderers/dailymotion.min.js
- M external/mediaelement/build/renderers/facebook.min.js
- M external/mediaelement/build/renderers/soundcloud.min.js
- M external/mediaelement/build/renderers/twitch.min.js
- M external/mediaelement/build/renderers/vimeo.min.js
- M external/mediaelement/changelog.md
- M external/yui/2in3/dist/2.9.0/build/assets/skins/sam/colorpicker.css
- M external/yui/2in3/dist/2.9.0/build/assets/skins/sam/skin.css
- M external/yui/2in3/dist/2.9.0/build/yui2-skin-sam-colorpicker/assets/skins/sam/colorpicker-skin.css
- M external/yui/2in3/dist/2.9.0/build/yui2-skin-sam-colorpicker/assets/skins/sam/colorpicker.css
- M external/yui/2in3/dist/2.9.0/build/yui2-skin-sam-colorpicker/yui2-skin-sam-colorpicker-min.css
- M external/yui/2in3/dist/2.9.0/build/yui2-skin-sam/yui2-skin-sam-min.css
- M framework/core/assets/less/tree.less
- M framework/core/controllers/expController.php
- M framework/core/definitions/geo_region.php
- M framework/core/expFramework.php
- M framework/core/forms/controls/jquery/tagtreecontrol.php
- M framework/core/forms/controls/tagtreecontrol.php
- M framework/core/models/expConfig.php
- M framework/core/subsystems/expDatabase.php
- M framework/core/subsystems/expHtmlToPDF.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/expTheme.php
- M framework/modules/addressbook/definitions/addresses.php
- M framework/modules/addressbook/definitions/external_addresses.php
- M framework/modules/administration/views/administration/configure_site.bootstrap3.tpl
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/blog/definitions/blog.php
- M framework/modules/company/definitions/companies.php
- M framework/modules/company/views/company/edit.tpl
- M framework/modules/company/views/company/showall.tpl
- M framework/modules/container/views/container/_hardcoded_module_menu.bootstrap3.tpl
- M framework/modules/container/views/container/_hardcoded_module_menu.newui.tpl
- M framework/modules/core/definitions/expCats.php
- M framework/modules/core/definitions/expTags.php
- M framework/modules/ecommerce/assets/css/inline-cart.css
- M framework/modules/ecommerce/controllers/storeCategoryController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/definitions/discounts.php
- M framework/modules/ecommerce/definitions/model_aliases.php
- M framework/modules/ecommerce/definitions/option.php
- M framework/modules/ecommerce/definitions/optiongroup.php
- M framework/modules/ecommerce/definitions/order_discounts.php
- M framework/modules/ecommerce/definitions/order_status_changes.php
- M framework/modules/ecommerce/definitions/orderitems.php
- M framework/modules/ecommerce/definitions/orders.php
- M framework/modules/ecommerce/definitions/product.php
- M framework/modules/ecommerce/definitions/product_notes.php
- M framework/modules/ecommerce/definitions/purchase_order.php
- M framework/modules/ecommerce/models/discounts.php
- M framework/modules/ecommerce/models/order.php
- M framework/modules/ecommerce/models/order_discounts.php
- M framework/modules/ecommerce/models/product_notes.php
- M framework/modules/ecommerce/models/storeCategory.php
- M framework/modules/ecommerce/products/models/childProduct.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/product/edit.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.bootstrap3.tpl
- M framework/modules/ecommerce/shippingcalculators/views/tablebasedcalculator/configure.tpl
- M framework/modules/ecommerce/views/ecomconfig/edit_discount.bootstrap3.tpl
- M framework/modules/ecommerce/views/ecomconfig/edit_discount.tpl
- M framework/modules/ecommerce/views/store/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/show.tpl
- M framework/modules/ecommerce/views/store/showall.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/showall.tpl
- M framework/modules/faq/controllers/faqController.php
- M framework/modules/file/views/file/elfinder.tpl
- M framework/modules/filedownloads/definitions/filedownload.php
- M framework/modules/help/controllers/helpController.php
- M framework/modules/help/definitions/help.php
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/navigation/definitions/sectionref.php
- M framework/modules/news/definitions/news.php
- M framework/modules/notfound/views/notfound/page_not_found.bootstrap.tpl
- M framework/modules/notfound/views/notfound/page_not_found.bootstrap3.tpl
- M framework/modules/photoalbum/definitions/photo.php
- M framework/modules/pixidou/assets/css/pixidou.css
- M framework/modules/portfolio/definitions/portfolio.php
- M framework/modules/rss/definitions/expRss.php
- M framework/modules/search/controllers/searchController.php
- M framework/modules/search/definitions/search.php
- M framework/modules/search/models/search.php
- M framework/plugins/function.google_map.php
- M install/upgrades/remove_oldfiles.php
- M source_selector.php
- M themes/bootstrap3theme/editors/ckeditor/ckeditor.css
- M themes/bootstrap3theme/editors/tinymce/tinymce.css
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