Changeset [5b10f33f0af2cc484ff4c375af3203347b6f7de1] by dogmatic69
Revision 5b10f33f0af2cc484ff4c375af3203347b6f7de1,
committed by dogmatic69
· July 4th, 2010 @ 03:40 PM
Merge branch 'dev' of github.com:infinitas/infinitas into
dev
http://github.com/infinitas/infinitas/commit/5b10f33f0af2cc484ff4c3...
35 changed files
-
A
extensions/libs/webroot/js/3rd/moving_boxes.js -
A
extensions/libs/webroot/js/3rd/side_bar.js -
A
infinitas/management/views/elements/modules/comment.ctp -
A
infinitas/management/views/elements/modules/login.ctp -
A
infinitas/management/views/elements/modules/status_bar.ctp -
R
views/elements/global/comment_add.ctp -
R
views/elements/modules/search.ctp -
M
app_controller.php -
M
config/bootstrap.php -
M
config/migrations/082_general_changes.php -
M
config/routes.php -
M
extensions/data/views/helpers/csv.php -
M
extensions/libs/controllers/components/infinitas.php -
M
extensions/libs/views/helpers/infinitas.php -
M
extensions/libs/webroot/css/jquery_ui.css -
M
extensions/libs/webroot/js/3rd/jquery_ui.js -
M
extensions/libs/webroot/js/infinitas.js -
M
extensions/libs/webroot/js/libs/html.js -
M
infinitas/cms/controllers/contents_controller.php -
M
infinitas/cms/views/contents/index.ctp -
M
infinitas/installer/controllers/releases_controller.php -
M
infinitas/installer/views/install/site_config.ctp -
M
infinitas/management/controllers/users_controller.php -
M
infinitas/management/models/short_url.php -
M
infinitas/management/views/elements/modules/rate.ctp -
M
infinitas/management/views/users/admin_index.ctp -
M
infinitas/management/views/users/admin_login.ctp -
M
infinitas/management/views/users/login.ctp -
M
infinitas/management/views/users/register.ctp -
M
infinitas/management/views/users/reset_password.ctp -
M
infinitas/shop/controllers/images_controller.php -
M
infinitas/shop/controllers/products_controller.php -
M
infinitas/shop/plugins/order/views/orders/csv/admin_index.ctp -
M
views/layouts/admin.ctp -
M
webroot/css/admin.css