Changeset [362cdc139001fb7541938e136cd861e8acbce4d6] by Ceeram

Revision 362cdc139001fb7541938e136cd861e8acbce4d6, committed by Ceeram · January 6th, 2010 @ 09:27 AM

Merge branch 'dev' of git://github.com/infinitas/infinitas into dev
http://github.com/infinitas/infinitas/commit/362cdc139001fb7541938e...

90 changed files

R tests/cases/controllers/categories_controller.test.php
R tests/cases/controllers/content_frontpages_controller.test.php
R tests/cases/controllers/contents_controller.test.php
R tests/cases/controllers/sections_controller.test.php
R tests/cases/models/content_frontpage.test.php
M app_controller.php
M app_helper.php
M app_model.php
M config/bootstrap.php
M config/core.php
M config/geshi.php
M config/images.php
M config/routes.php
M config/schema/db_acl.php
M config/schema/i18n.php
M config/schema/sessions.php
M infinitas/blog/blog_app_controller.php
M infinitas/blog/blog_app_model.php
M infinitas/blog/controllers/posts_controller.php
M infinitas/blog/models/post.php
M infinitas/blog/models/tag.php
M infinitas/blog/views/elements/admin/right_boxes.ctp
M infinitas/blog/views/elements/tag_cloud.ctp
M infinitas/blog/views/helpers/blog.php
M infinitas/blog/views/helpers/comment_layout.php
M infinitas/blog/views/helpers/post_layout.php
M infinitas/cms/cms_app_controller.php
M infinitas/cms/cms_app_model.php
M infinitas/cms/controllers/categories_controller.php
M infinitas/cms/controllers/content_frontpages_controller.php
M infinitas/cms/controllers/contents_controller.php
M infinitas/cms/controllers/features_controller.php
M infinitas/cms/models/category.php
M infinitas/cms/models/content.php
M infinitas/cms/models/content_frontpage.php
M infinitas/cms/models/feature.php
M infinitas/core/controllers/backups_controller.php
M infinitas/core/controllers/components/core_config.php
M infinitas/core/controllers/components/cron.php
M infinitas/core/core_app_controller.php
M infinitas/core/core_app_model.php
M infinitas/core/models/backup.php
M infinitas/core/models/behaviors/commentable.php
M infinitas/core/models/behaviors/feedable.php
M infinitas/core/models/behaviors/lockable.php
M infinitas/core/models/behaviors/logable.php
M infinitas/core/models/behaviors/ordered.php
M infinitas/core/models/behaviors/publishable.php
M infinitas/core/models/behaviors/revision.php
M infinitas/core/models/behaviors/sluggable.php
M infinitas/core/models/behaviors/viewable.php
M infinitas/core/models/comment.php
M infinitas/core/models/log.php
M infinitas/google/config/setup.php
M infinitas/google/controllers/google_contacts_controller.php
M infinitas/google/google_app_controller.php
M infinitas/google/libs/google_api_base.php
M infinitas/google/libs/google_api_contacts.php
M infinitas/google/models/google_contacts.php
M infinitas/google/views/helpers/analytics.php
M infinitas/google/views/helpers/chart.php
M infinitas/installer/config/database.install
M infinitas/installer/controllers/install_controller.php
M infinitas/installer/installer_app_controller.php
M infinitas/installer/installer_app_model.php
M infinitas/installer/models/install.php
M infinitas/management/controllers/comments_controller.php
M infinitas/management/controllers/configs_controller.php
M infinitas/management/controllers/file_manager_controller.php
M infinitas/management/controllers/management_controller.php
M infinitas/management/management_app_controller.php
M infinitas/management/management_app_model.php
M infinitas/management/models/config.php
M infinitas/management/models/files.php
M infinitas/management/models/folders.php
M infinitas/management/views/helpers/core.php
M infinitas/newsletter/controllers/campaigns_controller.php
M infinitas/newsletter/controllers/newsletters_controller.php
M infinitas/newsletter/controllers/templates_controller.php
M infinitas/newsletter/models/campaign.php
M infinitas/newsletter/models/newsletter.php
M infinitas/newsletter/models/template.php
M infinitas/newsletter/newsletter_app_controller.php
M infinitas/newsletter/newsletter_app_model.php
M infinitas/newsletter/views/helpers/campaign_layout.php
M infinitas/newsletter/views/helpers/letter.php
M infinitas/newsletter/views/helpers/newsletter_layout.php
M vendors/zip.php
M views/helpers/design.php
M views/helpers/image.php