Changeset [9de2cdb352f9c113d8c8e99fb8234f748e4a5a32] by dogmatic69
Revision 9de2cdb352f9c113d8c8e99fb8234f748e4a5a32,
committed by dogmatic69
· November 14th, 2010 @ 06:06 PM
Merge branch 'dev-layouts' into dev
https://github.com/infinitas/infinitas/commit/9de2cdb352f9c113d8c8e...
41 changed files
-
A
core/configs/views/configs/admin_available.ctp -
A
core/contents/contents_app_controller.php -
A
core/contents/contents_app_model.php -
A
core/contents/contents_events.php -
A
core/contents/controllers/global_contents_controller.php -
A
core/contents/controllers/global_layouts_controller.php -
A
core/contents/models/behaviors/contentable.php -
A
core/contents/models/global_content.php -
A
core/contents/models/global_layout.php -
A
core/contents/views/elements/content_form.ctp -
A
core/contents/views/global_contents/admin_edit.ctp -
A
core/contents/views/global_contents/admin_index.ctp -
A
core/contents/views/global_contents/admin_move.ctp -
A
core/contents/views/global_layouts/admin_form.ctp -
A
core/contents/views/global_layouts/admin_index.ctp -
A
core/contents/webroot/img/icon.png -
A
webroot/img/core/icons/actions/new_window.png -
M
app_controller.php -
M
app_helper.php -
M
app_model.php -
M
core/assets/webroot/css/admin_nav.css -
M
core/comments/config/config.php -
M
core/configs/configs_events.php -
M
core/configs/controllers/configs_controller.php -
M
core/configs/models/config.php -
M
core/configs/views/configs/admin_index.ctp -
M
core/feed/views/feeds/admin_form.ctp -
M
core/filemanager/views/filemanager/admin_view.ctp -
M
core/libs/config/images.php -
M
core/libs/models/behaviors/infinitas.php -
M
core/libs/vendors/shells/templates/infinitas/views/form.ctp -
M
core/libs/views/global/move.ctp -
M
core/management/views/ip_addresses/admin_form.ctp -
M
core/management/views/management/admin_site.ctp -
M
core/management/views/pages/admin_add.ctp -
M
core/management/views/pages/admin_edit.ctp -
M
plugins/blog -
M
plugins/cms -
M
plugins/gallery -
M
plugins/shop -
M
views/elements/pagination/navigation.ctp