Changeset [4c3fb174e48e0f64eabe35bbcc432dc49a29fbc1] by dleffler
March 26th, 2014 @ 02:30 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/expFramework.php
framework/core/subsystems/expJavascript.php
https://github.com/exponentcms/exponent-cms/commit/4c3fb174e48e0f64...
Committed by dleffler
- M external/SimpleAjaxUploader.js
- M framework/core/expFramework.php
- M framework/core/models/expRecord.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/blog/controllers/blogController.php
- M framework/modules/core/controllers/expCommentController.php
- M framework/modules/core/controllers/expSimpleNoteController.php
- M framework/modules/core/models/expComment.php
- M framework/modules/facebook/views/facebook/showall.tpl
- M framework/modules/file/connector/elFinder.options.js
- M framework/modules/file/connector/elfinder.php
- M framework/modules/file/connector/uploader.php
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/models/expFile.php
- M framework/modules/file/views/file/elfinder.tpl
- M framework/modules/filedownloads/models/filedownload.php
- M framework/modules/importexport/controllers/importexportController.php
- M framework/modules/importexport/views/importexport/export.tpl
- M framework/modules/importexport/views/importexport/import.tpl
- M framework/modules/importexport/views/importexport/import_select.tpl
- M framework/modules/links/controllers/linksController.php
- M framework/modules/links/models/links.php
- M framework/modules/migration/controllers/migrationController.php
- M framework/modules/photoalbum/models/photo.php
- M framework/modules/portfolio/controllers/portfolioController.php
- M framework/modules/portfolio/models/portfolio.php
- M framework/plugins/block.script.php
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