Changeset [3ef386a1e10cdd7701829b53589be5525cf5f70e] by dleffler
Revision 3ef386a1e10cdd7701829b53589be5525cf5f70e,
committed by dleffler
· May 27th, 2016 @ 09:09 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/3ef386a1e10cdd77...
297 changed files
-
A
external/editors/ckeditor/plugins/colordialog/dialogs/colordialog.css -
A
external/iCalcreator-2.22/iCalcreator.php -
A
external/iCalcreator-2.22/lib/calendarComponent.class.php -
A
external/iCalcreator-2.22/lib/iCal.XML.inc.php -
A
external/iCalcreator-2.22/lib/iCal.tz.inc.php -
A
external/iCalcreator-2.22/lib/iCal.vCard.inc.php -
A
external/iCalcreator-2.22/lib/iCalBase.class.php -
A
external/iCalcreator-2.22/lib/iCalUtilityFunctions.class.php -
A
external/iCalcreator-2.22/lib/iCaldateTime.class.php -
A
external/iCalcreator-2.22/lib/valarm.class.php -
A
external/iCalcreator-2.22/lib/vcalendar.class.php -
A
external/iCalcreator-2.22/lib/vevent.class.php -
A
external/iCalcreator-2.22/lib/vfreebusy.class.php -
A
external/iCalcreator-2.22/lib/vjournal.class.php -
A
external/iCalcreator-2.22/lib/vtimezone.class.php -
A
external/iCalcreator-2.22/lib/vtodo.class.php -
A
external/jquery/addons/js/shims/styles/shim-ext.css -
A
external/jquery/addons/js/shims/styles/shim.css -
A
external/jquery/js/jquery-1.12.4.min.js -
A
external/jquery/js/jquery-2.2.4.min.js -
A
files/avatars/.foldericon.png -
A
files/uploads/.foldericon.png -
A
framework/modules/blog/views/blog/show.bootstrap3.tpl -
A
framework/modules/blog/views/blog/showall.bootstrap3.tpl -
A
framework/modules/common/views/configure/files.bootstrap3.tpl -
A
framework/modules/common/views/file/configure/Slideshow.bootstrap3.tpl -
A
framework/modules/ecommerce/views/eventregistration/eventsCalendar.bootstrap3.tpl -
A
framework/modules/events/definitions/event_cache.php -
A
framework/modules/events/views/event/configure/pull_google.bootstrap.tpl.old -
A
framework/modules/events/views/event/configure/pull_google.bootstrap3.tpl.old -
A
framework/modules/events/views/event/configure/pull_google.tpl.old -
A
framework/modules/events/views/event/import.tpl -
A
framework/modules/events/views/event/showall.bootstrap3.tpl -
A
framework/modules/events/views/event/showall_Day.bootstrap3.tpl -
A
framework/modules/events/views/event/showall_Mini-Calendar.bootstrap3.tpl -
A
framework/modules/events/views/event/showall_Monthly List.bootstrap3.tpl -
A
framework/modules/events/views/event/showall_Week.bootstrap3.tpl -
A
framework/modules/filedownloads/views/filedownload/showall.bootstrap3.tpl -
A
framework/modules/mediaplayer/views/media/edit.bootstrap3.tpl -
A
framework/modules/news/views/news/configure/showall_toggle.config -
A
framework/modules/news/views/news/show.bootstrap3.tpl -
A
framework/modules/news/views/news/showall.bootstrap3.tpl -
A
framework/modules/news/views/news/showall_toggle.tpl -
A
framework/modules/photoalbum/views/photo/configure/gallery.bootstrap3.tpl -
A
framework/modules/photoalbum/views/photo/configure/slideshow.bootstrap3.config -
A
framework/modules/portfolio/views/portfolio/showall.bootstrap3.tpl -
A
framework/modules/portfolio/views/portfolio/showall_simple_list.bootstrap3.tpl -
A
framework/modules/portfolio/views/portfolio/showall_toggle.bootstrap3.tpl -
A
framework/modules/search/assets/css/search.css -
A
framework/modules/search/views/search/search.bootstrap3.tpl -
R
external/html5forms/EventHelpers.js -
R
external/html5forms/html5forms.fallback.js -
R
external/html5forms/modernizr-283.js -
R
external/html5forms/webforms2/validationPointer.png -
R
external/html5forms/webforms2/webforms2-msie.js -
R
external/html5forms/webforms2/webforms2.css -
R
external/html5forms/webforms2/webforms2_src.js -
R
external/iCalcreator.class.php -
R
external/jquery/addons/css/spectrum.css -
R
external/jquery/addons/js/i18n/jquery-ui-timepicker-addon-i18n.js -
R
external/jquery/addons/js/i18n/jquery-ui-timepicker-addon-i18n.min.js -
R
external/jquery/addons/js/jquery.placeholder.js -
R
external/jquery/addons/js/pwstrength-bootstrap.js -
R
external/jquery/addons/js/spectrum.js -
R
external/jquery/js/jquery-1.12.3.min.js -
R
external/jquery/js/jquery-2.2.3.min.js -
R
framework/modules/events/views/event/configure/pull_google.bootstrap.tpl -
R
framework/modules/events/views/event/configure/pull_google.bootstrap3.tpl -
R
framework/modules/events/views/event/configure/pull_google.tpl -
M
cron/find_help.php -
M
cron/lang_extract.php -
M
exponent_constants.php -
M
external/ExtPrograms.csv -
M
external/editors/ckeditor/CHANGES.md -
M
external/editors/ckeditor/ckeditor.js -
M
external/editors/ckeditor/lang/bn.js -
M
external/editors/ckeditor/plugins/clipboard/dialogs/paste.js -
M
external/editors/ckeditor/plugins/colordialog/dialogs/colordialog.js -
M
external/editors/ckeditor/plugins/dialog/dialogDefinition.js -
M
external/editors/ckeditor/plugins/find/dialogs/find.js -
M
external/editors/ckeditor/plugins/sourcedialog/lang/bn.js -
M
external/editors/ckeditor/plugins/widget/plugin.js -
M
external/editors/ckeditor/skins/kama/editor.css -
M
external/editors/ckeditor/skins/kama/editor_ie.css -
M
external/editors/ckeditor/skins/kama/editor_ie7.css -
M
external/editors/ckeditor/skins/kama/editor_ie8.css -
M
external/editors/ckeditor/skins/kama/editor_iequirks.css -
M
external/editors/ckeditor/skins/moono/dialog.css -
M
external/editors/ckeditor/skins/moono/dialog_ie.css -
M
external/editors/ckeditor/skins/moono/dialog_ie7.css -
M
external/editors/ckeditor/skins/moono/dialog_ie8.css -
M
external/editors/ckeditor/skins/moono/dialog_iequirks.css -
M
external/editors/ckeditor/skins/moono/editor.css -
M
external/editors/ckeditor/skins/moono/editor_gecko.css -
M
external/editors/ckeditor/skins/moono/editor_ie.css -
M
external/editors/ckeditor/skins/moono/editor_ie7.css -
M
external/editors/ckeditor/skins/moono/editor_ie8.css -
M
external/editors/ckeditor/skins/moono/editor_iequirks.css -
M
external/editors/tinymce/changelog.txt -
M
external/editors/tinymce/plugins/quickupload/plupload.full.min.js -
M
external/editors/tinymce/plugins/table/plugin.min.js -
M
external/editors/tinymce/tinymce.min.js -
M
external/elFinder/themes/moono/css/file-icons.less -
M
external/elFinder/themes/moono/css/theme.css -
M
external/elFinder/themes/windows-10/css/navbar.css -
M
external/elFinder/themes/windows-10/css/reset.css -
M
external/font-awesome4/fonts/FontAwesome.otf -
M
external/font-awesome4/fonts/fontawesome-webfont.eot -
M
external/font-awesome4/fonts/fontawesome-webfont.svg -
M
external/font-awesome4/fonts/fontawesome-webfont.ttf -
M
external/font-awesome4/fonts/fontawesome-webfont.woff -
M
external/font-awesome4/fonts/fontawesome-webfont.woff2 -
M
external/font-awesome4/less/font-awesome.less -
M
external/font-awesome4/less/icons.less -
M
external/font-awesome4/less/variables.less -
M
external/jquery/addons/css/jquery.colorbox.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/jquery.colorbox.js -
M
external/jquery/addons/js/jquery.datetimepicker.js -
M
external/jquery/addons/js/migrate.js -
M
external/jquery/addons/js/owl.carousel.js -
M
external/jquery/addons/js/strength-meter.js -
M
external/jquery/addons/less/bootstrap-dialog.less -
M
external/mediaelement/build/flashmediaelement-cdn.swf -
M
external/mediaelement/build/flashmediaelement-debug.swf -
M
external/mediaelement/build/flashmediaelement.swf -
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.js -
M
external/mediaelement/build/mediaelementplayer.min.js -
M
external/mediaelement/build/silverlightmediaelement.xap -
M
external/mediaelement/changelog.md -
M
framework/core/assets/less/animate.less -
M
framework/core/assets/less/common.less -
M
framework/core/assets/less/forms-bootstrap3.less -
M
framework/core/forms/controls/autocompletecontrol.php -
M
framework/core/forms/controls/bootstrap/checkboxcontrol.php -
M
framework/core/forms/controls/bootstrap/datetimecontrol.php -
M
framework/core/forms/controls/bootstrap/formcontrol.php -
M
framework/core/forms/controls/bootstrap/genericcontrol.php -
M
framework/core/forms/controls/bootstrap/passwordcontrol.php -
M
framework/core/forms/controls/bootstrap3/checkboxcontrol.php -
M
framework/core/forms/controls/bootstrap3/datetimecontrol.php -
M
framework/core/forms/controls/bootstrap3/passwordcontrol.php -
M
framework/core/forms/controls/bootstrap3/yuicalendarcontrol.php -
M
framework/core/forms/controls/bootstrap3/yuidatetimecontrol.php -
M
framework/core/forms/controls/colorcontrol.php -
M
framework/core/forms/controls/datetimecontrol.php -
M
framework/core/forms/controls/jquery/yuicalendarcontrol.php -
M
framework/core/forms/controls/jquery/yuidatetimecontrol.php -
M
framework/core/forms/controls/newui/checkboxcontrol.php -
M
framework/core/forms/controls/newui/datetimecontrol.php -
M
framework/core/forms/controls/newui/genericcontrol.php -
M
framework/core/forms/controls/passwordcontrol.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/models/expRecord.php -
M
framework/core/subsystems/database/mysqli.php -
M
framework/core/subsystems/expCore.php -
M
framework/core/subsystems/expDateTime.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/expString.php -
M
framework/core/subsystems/expValidator.php -
M
framework/modules/addressbook/models/address.php -
M
framework/modules/addressbook/models/external_address.php -
M
framework/modules/addressbook/views/address/edit.bootstrap3.tpl -
M
framework/modules/addressbook/views/address/edit.tpl -
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/administration/views/administration/install_upgrades.tpl -
M
framework/modules/blog/views/blog/blogitem.tpl -
M
framework/modules/blog/views/blog/show.tpl -
M
framework/modules/blog/views/blog/showall.tpl -
M
framework/modules/common/views/common/pagination_links.bootstrap.tpl -
M
framework/modules/common/views/common/pagination_links.bootstrap3.tpl -
M
framework/modules/common/views/configure/files.tpl -
M
framework/modules/common/views/configure/module.bootstrap.tpl -
M
framework/modules/common/views/configure/module.bootstrap3.tpl -
M
framework/modules/common/views/configure/module.newui.tpl -
M
framework/modules/common/views/configure/module.tpl -
M
framework/modules/common/views/file/Slideshow.bootstrap3.tpl -
M
framework/modules/common/views/file/configure/Slideshow.tpl -
M
framework/modules/company/controllers/companyController.php -
M
framework/modules/ecommerce/billingcalculators/creditcard.php -
M
framework/modules/ecommerce/billingcalculators/passthru.php -
M
framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php -
M
framework/modules/ecommerce/controllers/cartController.php -
M
framework/modules/ecommerce/controllers/donationController.php -
M
framework/modules/ecommerce/controllers/ecomconfigController.php -
M
framework/modules/ecommerce/controllers/eventregistrationController.php -
M
framework/modules/ecommerce/controllers/orderController.php -
M
framework/modules/ecommerce/controllers/storeCategoryController.php -
M
framework/modules/ecommerce/controllers/storeController.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/models/storeCategory.php -
M
framework/modules/ecommerce/products/models/eventregistration.php -
M
framework/modules/ecommerce/products/models/product.php -
M
framework/modules/ecommerce/shippingcalculators/tablebasedcalculator.php -
M
framework/modules/ecommerce/views/cart/checkout.tpl -
M
framework/modules/ecommerce/views/ecomconfig/configure.bootstrap3.tpl -
M
framework/modules/ecommerce/views/ecomconfig/configure.tpl -
M
framework/modules/ecommerce/views/eventregistration/eventsCalendar.tpl -
M
framework/modules/ecommerce/views/order/edit_parcel.tpl -
M
framework/modules/ecommerce/views/store/ecomSearch.tpl -
M
framework/modules/ecommerce/views/store/eventsCalendar.tpl -
M
framework/modules/events/assets/css/calendar.css -
M
framework/modules/events/controllers/eventController.php -
M
framework/modules/events/models/event.php -
M
framework/modules/events/views/event/configure/pull_ical.bootstrap.tpl -
M
framework/modules/events/views/event/configure/pull_ical.bootstrap3.tpl -
M
framework/modules/events/views/event/configure/pull_ical.tpl -
M
framework/modules/events/views/event/configure/reminders.tpl -
M
framework/modules/events/views/event/day.tpl -
M
framework/modules/events/views/event/month.tpl -
M
framework/modules/events/views/event/monthlist.tpl -
M
framework/modules/events/views/event/showall.tpl -
M
framework/modules/events/views/event/showall_Day.tpl -
M
framework/modules/events/views/event/showall_Mini-Calendar.tpl -
M
framework/modules/events/views/event/showall_Monthly List.tpl -
M
framework/modules/events/views/event/showall_Week.tpl -
M
framework/modules/events/views/event/week.tpl -
M
framework/modules/facebook/views/facebook/showall.tpl -
M
framework/modules/facebook/views/facebook/showall_box.tpl -
M
framework/modules/file/connector/elfinder.php -
M
framework/modules/file/models/expFile.php -
M
framework/modules/file/views/file/export_eql.tpl -
M
framework/modules/filedownloads/views/filedownload/edit.bootstrap3.tpl -
M
framework/modules/filedownloads/views/filedownload/showall.tpl -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/importexport/controllers/importexportController.php -
M
framework/modules/importexport/views/importexport/import.tpl -
M
framework/modules/mediaplayer/views/media/showall.bootstrap3.tpl -
M
framework/modules/mediaplayer/views/media/showall.tpl -
M
framework/modules/migration/controllers/migrationController.php -
M
framework/modules/navigation/controllers/navigationController.php -
M
framework/modules/navigation/models/section.php -
M
framework/modules/news/views/news/newsitem.tpl -
M
framework/modules/news/views/news/show.tpl -
M
framework/modules/news/views/news/showall.tpl -
M
framework/modules/notfound/assets/css/results.css -
M
framework/modules/notfound/controllers/notfoundController.php -
M
framework/modules/notfound/views/notfound/page_not_found.tpl -
M
framework/modules/photoalbum/views/photo/configure/slideshow.config -
M
framework/modules/photoalbum/views/photo/configure/slideshow_touch.config -
M
framework/modules/photoalbum/views/photo/showall.bootstrap3.tpl -
M
framework/modules/photoalbum/views/photo/showall.tpl -
M
framework/modules/photoalbum/views/photo/showall_accordion.bootstrap3.tpl -
M
framework/modules/photoalbum/views/photo/showall_tabbed.bootstrap3.tpl -
M
framework/modules/photoalbum/views/photo/slideshow_slider.tpl -
M
framework/modules/portfolio/views/portfolio/showall.tpl -
M
framework/modules/portfolio/views/portfolio/showall_simple_list.tpl -
M
framework/modules/portfolio/views/portfolio/showall_toggle.tpl -
M
framework/modules/recyclebin/views/recyclebin/show.bootstrap3.tpl -
M
framework/modules/recyclebin/views/recyclebin/show.tpl -
M
framework/modules/report/controllers/reportController.php -
M
framework/modules/search/controllers/searchController.php -
M
framework/modules/search/models/search.php -
M
framework/modules/search/views/search/search.tpl -
M
framework/modules/search/views/search/searchlist.tpl -
M
framework/modules/socialfeed/assets/images/instagram.png -
M
framework/modules/twitter/models/Twitter.php -
M
framework/modules/users/controllers/usersController.php -
M
framework/modules/users/models/user.php -
M
framework/modules/users/views/login/showlogin.bootstrap3.tpl -
M
framework/modules/users/views/users/_permissions.bootstrap3.tpl -
M
framework/modules/users/views/users/change_password.bootstrap3.tpl -
M
framework/modules/users/views/users/edit_userpassword.bootstrap3.tpl -
M
framework/plugins/block.form.php -
M
framework/plugins/bootstrap/function.icon.php -
M
framework/plugins/bootstrap3/function.icon.php -
M
framework/plugins/function.control.php -
M
framework/plugins/function.ecomconfig.php -
M
framework/plugins/function.icon.php -
M
framework/plugins/function.loading.php -
M
framework/plugins/function.prod_images.php -
M
framework/plugins/modifier.format_date.php -
M
framework/plugins/modifier.summarize.php -
M
framework/plugins/newui/block.form.php -
M
framework/plugins/newui/function.icon.php -
M
install/pages/final.php -
M
install/pages/install-6.php -
M
install/pages/upgrade-4.php -
M
install/upgrades/remove_oldfiles.php -
M
xmlrpc.php