Changeset [063c8af856048e57ed3f51c6a852fd2363bec38a] by dleffler
January 27th, 2018 @ 06:51 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/063c8af856048e57...
Committed by dleffler
- A external/adminer/adminer-4.5.0-mysql.php
- A external/editors/tinymce/skins/xenmce/fonts/tinymce-small.eot
- A external/editors/tinymce/skins/xenmce/fonts/tinymce-small.json
- A external/editors/tinymce/skins/xenmce/fonts/tinymce-small.svg
- A external/editors/tinymce/skins/xenmce/fonts/tinymce-small.ttf
- A external/editors/tinymce/skins/xenmce/fonts/tinymce-small.woff
- A external/editors/tinymce/skins/xenmce/fonts/tinymce.eot
- A external/editors/tinymce/skins/xenmce/fonts/tinymce.json
- A external/editors/tinymce/skins/xenmce/fonts/tinymce.svg
- A external/editors/tinymce/skins/xenmce/fonts/tinymce.ttf
- A external/editors/tinymce/skins/xenmce/fonts/tinymce.woff
- A external/jquery/addons/css/dataTables.bootstrap2.css
- A external/jquery/addons/css/dataTables.tableTools2.css
- A external/jquery/addons/css/datatables.responsive2.css
- A external/jquery/addons/css/jquery.dataTables2.css
- A external/jquery/addons/js/dataTables.bootstrap2.js
- A external/jquery/addons/js/dataTables.tableTools2.js
- A external/jquery/addons/js/datatables.responsive2.js
- A external/jquery/addons/js/jquery.dataTables2.js
- A framework/conf/data/DB_ENGINE.dropdown
- A framework/modules/file/views/file/list_bad_files.tpl
- R external/adminer/adminer-4.4.0-mysql.php
- R external/editors/tinymce/skins/lightgray/AbsoluteLayout.less
- R external/editors/tinymce/skins/lightgray/Animations.less
- R external/editors/tinymce/skins/lightgray/Arrows.less
- R external/editors/tinymce/skins/lightgray/Button.less
- R external/editors/tinymce/skins/lightgray/ButtonGroup.less
- R external/editors/tinymce/skins/lightgray/Checkbox.less
- R external/editors/tinymce/skins/lightgray/ColorBox.less
- R external/editors/tinymce/skins/lightgray/ColorButton.less
- R external/editors/tinymce/skins/lightgray/ColorPicker.less
- R external/editors/tinymce/skins/lightgray/ComboBox.less
- R external/editors/tinymce/skins/lightgray/Container.less
- R external/editors/tinymce/skins/lightgray/Content.Inline.less
- R external/editors/tinymce/skins/lightgray/Content.Objects.less
- R external/editors/tinymce/skins/lightgray/Content.less
- R external/editors/tinymce/skins/lightgray/CropRect.less
- R external/editors/tinymce/skins/lightgray/FieldSet.less
- R external/editors/tinymce/skins/lightgray/FitLayout.less
- R external/editors/tinymce/skins/lightgray/FloatPanel.less
- R external/editors/tinymce/skins/lightgray/FlowLayout.less
- R external/editors/tinymce/skins/lightgray/Icons.Ie7.less
- R external/editors/tinymce/skins/lightgray/Icons.less
- R external/editors/tinymce/skins/lightgray/Iframe.less
- R external/editors/tinymce/skins/lightgray/ImagePanel.less
- R external/editors/tinymce/skins/lightgray/InfoBox.less
- R external/editors/tinymce/skins/lightgray/Label.less
- R external/editors/tinymce/skins/lightgray/ListBox.less
- R external/editors/tinymce/skins/lightgray/Menu.less
- R external/editors/tinymce/skins/lightgray/MenuBar.less
- R external/editors/tinymce/skins/lightgray/MenuButton.less
- R external/editors/tinymce/skins/lightgray/MenuItem.less
- R external/editors/tinymce/skins/lightgray/Mixins.less
- R external/editors/tinymce/skins/lightgray/Notification.less
- R external/editors/tinymce/skins/lightgray/Panel.less
- R external/editors/tinymce/skins/lightgray/Path.less
- R external/editors/tinymce/skins/lightgray/Progress.less
- R external/editors/tinymce/skins/lightgray/Radio.less
- R external/editors/tinymce/skins/lightgray/Reset.less
- R external/editors/tinymce/skins/lightgray/ResizeHandle.less
- R external/editors/tinymce/skins/lightgray/Scrollable.less
- R external/editors/tinymce/skins/lightgray/SelectBox.less
- R external/editors/tinymce/skins/lightgray/Sidebar.less
- R external/editors/tinymce/skins/lightgray/Slider.less
- R external/editors/tinymce/skins/lightgray/Spacer.less
- R external/editors/tinymce/skins/lightgray/SplitButton.less
- R external/editors/tinymce/skins/lightgray/StackLayout.less
- R external/editors/tinymce/skins/lightgray/TabPanel.less
- R external/editors/tinymce/skins/lightgray/TextBox.less
- R external/editors/tinymce/skins/lightgray/Throbber.less
- R external/editors/tinymce/skins/lightgray/TinyMCE.less
- R external/editors/tinymce/skins/lightgray/ToolTip.less
- R external/editors/tinymce/skins/lightgray/Variables.less
- R external/editors/tinymce/skins/lightgray/Window.less
- R external/editors/tinymce/skins/lightgray/skin.dev.less
- R external/editors/tinymce/skins/lightgray/skin.ie7.dev.less
- R external/editors/tinymce/skins/lightgray/skin.ie7.less
- R external/editors/tinymce/skins/lightgray/skin.ie7.min.css
- R external/editors/tinymce/skins/lightgray/skin.json
- R external/editors/tinymce/skins/lightgray/skin.less
- R external/editors/tinymce/skins/xenmce/fonts/icomoon-small.eot
- R external/editors/tinymce/skins/xenmce/fonts/icomoon-small.svg
- R external/editors/tinymce/skins/xenmce/fonts/icomoon-small.ttf
- R external/editors/tinymce/skins/xenmce/fonts/icomoon-small.woff
- R external/editors/tinymce/skins/xenmce/fonts/icomoon.eot
- R external/editors/tinymce/skins/xenmce/fonts/icomoon.svg
- R external/editors/tinymce/skins/xenmce/fonts/icomoon.ttf
- R external/editors/tinymce/skins/xenmce/fonts/icomoon.woff
- R external/editors/tinymce/skins/xenmce/img/wline.gif
- R external/editors/tinymce/skins/xenmce/skin.ie7.min.css
- R external/editors/tinymce/skins/xenmce/skin.json
- R external/editors/tinymce/skins/xenmce/skin.min.css
- M ".htaccess"
- M cron/generateSiteMap.php
- M exponent_constants.php
- M external/ExtPrograms.csv
- M external/adminer/admin.php
- M external/adminer/plugins/ckeditor.php
- M external/adminer/plugins/edit-calendar.php
- M external/adminer/plugins/edit-text-serialized.php
- M external/adminer/plugins/plugin.php
- M external/adminer/plugins/table-structure.php
- M external/adminer/plugins/tables-filter.php
- M external/adminer/plugins/tinymce.php
- 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/bbcode/plugin.min.js
- M external/editors/tinymce/plugins/charmap/plugin.min.js
- M external/editors/tinymce/plugins/code/plugin.min.js
- M external/editors/tinymce/plugins/colorpicker/plugin.min.js
- M external/editors/tinymce/plugins/contextmenu/plugin.min.js
- M external/editors/tinymce/plugins/directionality/plugin.min.js
- M external/editors/tinymce/plugins/emoticons/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/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/importcss/plugin.min.js
- M external/editors/tinymce/plugins/insertdatetime/plugin.min.js
- M external/editors/tinymce/plugins/legacyoutput/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/nonbreaking/plugin.min.js
- M external/editors/tinymce/plugins/noneditable/plugin.min.js
- M external/editors/tinymce/plugins/pagebreak/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/save/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/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/visualblocks/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/skins/lightgray/fonts/tinymce.eot
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.svg
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.ttf
- M external/editors/tinymce/skins/lightgray/fonts/tinymce.woff
- M external/editors/tinymce/skins/lightgray/skin.min.css
- M external/editors/tinymce/skins/xenmce/content.inline.min.css
- M external/editors/tinymce/skins/xenmce/content.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 framework/conf/data/extra_phrases.php
- M framework/conf/extensions/database.defaults.php
- M framework/core/controllers/expController.php
- M framework/core/subsystems/database/mysqli.php
- M framework/core/subsystems/expModules.php
- M framework/core/subsystems/expRouter.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/container/controllers/containerController.php
- M framework/modules/ecommerce/assets/css/ecom-bs3.css
- M framework/modules/ecommerce/billingcalculators/cash.php
- M framework/modules/ecommerce/billingcalculators/creditcard.php
- M framework/modules/ecommerce/billingcalculators/passthru.php
- M framework/modules/ecommerce/billingcalculators/paylater.php
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/models/billingcalculator.php
- M framework/modules/ecommerce/models/shippingcalculator.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/models/giftcard.php
- M framework/modules/ecommerce/products/models/product.php
- M framework/modules/ecommerce/products/views/product/edit.bootstrap3.tpl
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/ecommerce/views/billing/cash.tpl
- M framework/modules/ecommerce/views/billing/passthru.tpl
- M framework/modules/ecommerce/views/billing/paypalExpressCheckout.tpl
- M framework/modules/ecommerce/views/billing/worldpayCheckout.tpl
- M framework/modules/ecommerce/views/cart/confirm.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.bootstrap3.tpl
- M framework/modules/ecommerce/views/ecomconfig/configure.tpl
- M framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap.tpl
- M framework/modules/ecommerce/views/order/email_invoice.tpl
- M framework/modules/ecommerce/views/order/invoice.bootstrap3.tpl
- M framework/modules/ecommerce/views/order/invoice.tpl
- M framework/modules/ecommerce/views/order/show.bootstrap3.tpl
- M framework/modules/ecommerce/views/store/nonUnicodeProducts.tpl
- M framework/modules/ecommerce/views/store/show.bootstrap3.tpl
- M framework/modules/faq/controllers/faqController.php
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/models/expFile.php
- M framework/modules/forms/views/forms/showall.bootstrap.tpl
- M framework/modules/help/controllers/helpController.php
- M framework/modules/navigation/controllers/navigationController.php
- M framework/modules/report/views/report/generateOrderReport.bootstrap3.tpl
- M framework/modules/report/views/report/generateProductReport.bootstrap3.tpl
- M framework/modules/report/views/report/generate_report.bootstrap3.tpl
- M framework/modules/report/views/report/order_report.bootstrap3.tpl
- M framework/modules/report/views/report/product_report.bootstrap3.tpl
- M framework/modules/search/controllers/searchController.php
- M framework/modules/search/models/search.php
- M framework/modules/snippet/views/snippet/edit.tpl
- M framework/modules/users/controllers/usersController.php
- M framework/modules/users/views/users/_permissions.bootstrap.tpl
- M framework/modules/users/views/users/manage.bootstrap.tpl
- M framework/modules/users/views/users/manage_group_memberships.bootstrap.tpl
- M framework/modules/users/views/users/manage_groups.bootstrap.tpl
- M install/pages/install-2.php
- M install/pages/install-3.php
- M install/upgrades/remove_oldfiles.php
- M install/upgrades/update_events.php
- M web.config
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