Changeset [2b9d876482ebd8f212d41d3cddd4e423b96a662e] by Fred Dirkse - OIC Group, Inc
Revision 2b9d876482ebd8f212d41d3cddd4e423b96a662e,
committed by Fred Dirkse - OIC Group, Inc
· June 16th, 2011 @ 04:32 AM
Fixing conflicts??
https://github.com/exponentcms/exponent-cms/commit/2b9d876482ebd8f2...
81 changed files
-
A
framework/modules/notfound/assets/css/results.css -
A
phpdoc.ini -
A
tmp/css/.htaccess -
A
tmp/pixidou/.htaccess -
R
framework/modules/pixidou/assets/Thumbs.db -
R
framework/modules/pixidou/images/.htaccess -
M
.gitignore -
M
core_rss.php -
M
exponent.php -
M
exponent_version.php -
M
external/phpThumb/phpThumb.config.php -
M
framework/core/assets/css/admin-global.css -
M
framework/core/assets/images/toggle_red.png -
M
framework/core/controllers/expCommentController.php -
M
framework/core/controllers/expController.php -
M
framework/core/controllers/expHTMLEditorController.php -
M
framework/core/controllers/expModuleController.php -
M
framework/core/controllers/expNestedNodeController.php -
M
framework/core/controllers/expRatingController.php -
M
framework/core/controllers/expSimpleNoteController.php -
M
framework/core/datatypes/expComment.php -
M
framework/core/datatypes/expConfig.php -
M
framework/core/datatypes/expFile.php -
M
framework/core/datatypes/expNestedNode.php -
M
framework/core/datatypes/expRating.php -
M
framework/core/datatypes/expRecord.php -
M
framework/core/datatypes/expRss.php -
M
framework/core/datatypes/expSimpleNote.php -
M
framework/core/datatypes/expeAlerts.php -
M
framework/core/router_maps.php -
M
framework/core/subsystems/expAjaxReply.php -
M
framework/core/subsystems/expBot.php -
M
framework/core/subsystems/expCSS.php -
M
framework/core/subsystems/expHistory.php -
M
framework/core/subsystems/expJavascript.php -
M
framework/core/subsystems/expLDAP.php -
M
framework/core/subsystems/expLang.php -
M
framework/core/subsystems/expModules.php -
M
framework/core/subsystems/expPaginator.php -
M
framework/core/subsystems/expQueue.php -
M
framework/core/subsystems/expRouter.php -
M
framework/core/subsystems/expSession.php -
M
framework/core/subsystems/expSorter.php -
M
framework/core/subsystems/expTheme.php -
M
framework/core/subsystems/expValidator.php -
M
framework/modules/banners/controllers/bannerController.php -
M
framework/modules/blog/controllers/blogController.php -
M
framework/modules/company/controllers/companyController.php -
M
framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php -
M
framework/modules/filedownloads/controllers/filedownloadController.php -
M
framework/modules/notfound/controllers/notfoundController.php -
M
framework/modules/notfound/views/notfound/page_not_found.tpl -
M
framework/modules/pixidou/controllers/pixidouController.php -
M
framework/modules/pixidou/includes/class.upload/class.upload.php -
M
framework/modules/users/views/users/manage.tpl -
M
install/include/upgradescript.php -
M
install/index.php -
M
install/not_configured -
M
install/pages/upgrade-1.php -
M
install/pages/upgrade-2.php -
M
install/upgrades/clear_cache.php -
M
install/upgrades/convert_db_trim.php -
M
install/upgrades/install_tables.php -
M
install/upgrades/remove_headlinecontroller.php -
M
install/upgrades/version_tracking.php -
M
modules/common/views/_permissions.tpl -
M
modules/containermodule/class.php -
M
modules/containermodule/views/Default.tpl -
M
modules/formbuilder/actions/confirm_form.php -
M
modules/formbuilder/actions/export_csv.php -
M
modules/formbuilder/actions/submit_form.php -
M
modules/loginmodule/actions/logout.php -
M
modules/navigationmodule/class.php -
M
plugins/modifier.gettext.php -
M
subsystems/database/mysql.php -
M
subsystems/database/mysqli.php -
M
subsystems/database/mysqlid.php -
M
subsystems/database/postgres.php -
M
subsystems/files.php -
M
subsystems/mail.php -
M
subsystems/permissions.php