Changeset [3711a3502db21c32d3953768517ad441c1ca1ccb] by dogmatic69
Revision 3711a3502db21c32d3953768517ad441c1ca1ccb,
committed by dogmatic69
· May 8th, 2013 @ 04:19 PM
Merge branch 'dev' of github.com:infinitas/infinitas into dev
Conflicts:
CakePHP Core/Contents/View/Elements/content_form.ctp
https://github.com/infinitas/infinitas/commit/3711a3502db21c32d3953...
30 changed files
-
A
Core/Assets/webroot/less/bootstrap/base.less -
A
Core/Data/Lib/Csv/CsvFromArray.php -
A
Core/Modules/View/Elements/cache_config.ctp -
M
CakePHP -
M
Config/bootstrap.php -
M
Config/core.php -
M
Core/Comments/Lib/CommentsEvents.php -
M
Core/Configs/Lib/ConfigsEvents.php -
M
Core/Data/Lib/ClearCache.php -
M
Core/Emails/Lib/EmailsEvents.php -
M
Core/Events/Lib/EventCore.php -
M
Core/Filemanager/Lib/FilemanagerEvents.php -
M
Core/Libs/Controller/Component/InfinitasComponent.php -
M
Core/Libs/Lib/LibsEvents.php -
M
Core/Libs/View/Helper/DesignHelper.php -
M
Core/Locks/Lib/LocksEvents.php -
M
Core/Management/Lib/ManagementEvents.php -
M
Core/Menus/Lib/MenusEvents.php -
M
Core/Modules/Lib/ModulesEvents.php -
M
Core/Modules/View/Helper/ModuleLoaderHelper.php -
M
Core/Routes/Lib/RoutesEvents.php -
M
Core/Routes/Routing/InfinitasRouter.php -
M
Core/ServerStatus/Controller/ServerStatusController.php -
M
Core/ServerStatus/View/ServerStatus/admin_cache_status.ctp -
M
Core/Themes/Lib/ThemesEvents.php -
M
Core/Users/Lib/UsersEvents.php -
M
Core/ViewCounter/Lib/ViewCounterEvents.php -
M
Core/Webmaster/Lib/WebmasterEvents.php -
M
Lib/InfinitasPlugin.php -
M
Model/AppModel.php