Changeset [3cf96064b3c1c566259718951fae9779c22e6ec1] by Ceeram
Revision 3cf96064b3c1c566259718951fae9779c22e6ec1,
committed by Ceeram
· October 26th, 2010 @ 01:08 PM
Merge branch 'dev' of git://github.com/infinitas/infinitas into dev
Conflicts:
core/assets/webroot/css/960gs/960.css
http://github.com/infinitas/infinitas/commit/3cf96064b3c1c566259718...
199 changed files
-
A
core/assets/views/elements/messages/error.ctp -
A
core/assets/views/elements/messages/success.ctp -
A
core/assets/views/elements/messages/warning.ctp -
A
core/comments/views/elements/profile.ctp -
A
core/comments/views/elements/single_comment.ctp -
A
core/emails/attachments/empty -
A
core/emails/config/config.json -
A
core/emails/config/releases/000010_emails.php -
A
core/emails/config/releases/map.php -
A
core/emails/config/schema/schema.php -
A
core/emails/controllers/email_accounts_controller.php -
A
core/emails/controllers/mail_systems_controller.php -
A
core/emails/emails_app_controller.php -
A
core/emails/emails_app_model.php -
A
core/emails/emails_events.php -
A
core/emails/libs/attachment_downloader.php -
A
core/emails/models/datasources/imap_source.php -
A
core/emails/models/email_account.php -
A
core/emails/models/mail_system.php -
A
core/emails/views/email_accounts/admin_form.ctp -
A
core/emails/views/email_accounts/admin_index.ctp -
A
core/emails/views/helpers/email_attachments.php -
A
core/emails/views/mail_systems/admin_dashboard.ctp -
A
core/emails/views/mail_systems/admin_get_mail.ctp -
A
core/emails/views/mail_systems/admin_index.ctp -
A
core/emails/views/mail_systems/admin_view.ctp -
A
core/emails/webroot/img/icon.png -
A
core/emails/webroot/img/images/empty -
A
core/installer/controllers/plugins_controller.php -
A
core/installer/views/plugins/admin_dashboard.ctp -
A
core/installer/views/plugins/admin_index.ctp -
A
core/installer/views/plugins/admin_install.ctp -
A
core/installer/views/plugins/admin_update_infinitas.ctp -
A
core/installer/webroot/img/install.png -
A
core/installer/webroot/img/update.png -
A
core/management/views/management/admin_site.ctp -
A
core/newsletter/controllers/bounced_mails_controller.php -
A
core/newsletter/models/bounced_mail.php -
A
core/newsletter/webroot/css/newsletter.css -
A
core/newsletter/webroot/img/attachment.png -
A
core/newsletter/webroot/img/flagged-not.png -
A
core/newsletter/webroot/img/flagged.png -
A
core/short_urls/views/short_urls/admin_form.ctp -
A
core/short_urls/views/short_urls/admin_index.ctp -
A
core/short_urls/webroot/img/icon.png -
A
core/tags/views/tags/admin_form.ctp -
A
core/users/views/users/view.ctp -
A
core/view_counter/controllers/view_counts_controller.php -
A
core/view_counter/view_counter_app_controller.php -
A
core/view_counter/views/view_counts/admin_reports.ctp -
A
core/view_counter/webroot/img/icon.png -
A
core/view_counter/webroot/img/row.png -
A
webroot/img/core/icons/notifications/success.png -
R
core/categories/views/helpers/categories.php -
R
core/feed/config/releases/000081_feed.php -
R
core/feed/models/feeds_feed_item.php -
R
core/newsletter/views/helpers/campaign_layout.php -
R
core/newsletter/views/helpers/newsletter_layout.php -
R
core/newsletter/views/helpers/newsletter_layout.php.orig -
R
core/newsletter/views/templates/admin_form.ctp.orig -
R
core/tags/views/tags/admin_edit.ctp -
R
webroot/css/admin.css -
R
webroot/css/core.css -
R
webroot/css/demo.css -
R
webroot/css/form.css -
R
webroot/css/navigation.css -
R
webroot/css/pagination.css -
R
webroot/css/text.css -
M
.gitignore -
M
.htaccess -
M
app_controller.php -
M
app_error.php -
M
app_model.php -
M
config/bootstrap.php -
M
config/core.php -
M
core/assets/webroot/css/960gs/960.css -
M
core/assets/webroot/css/admin_nav.css -
M
core/assets/webroot/js/infinitas.js -
M
core/categories/categories_app_controller.php -
M
core/categories/categories_events.php -
M
core/categories/controllers/categories_controller.php -
M
core/categories/views/categories/admin_form.ctp -
M
core/comments/comments_events.php -
M
core/comments/config/config.php -
M
core/comments/models/behaviors/commentable.php -
M
core/comments/models/comment.php -
M
core/comments/views/comments/index.ctp -
M
core/comments/views/elements/modules/comment.ctp -
M
core/comments/webroot/css/comment.css -
M
core/comments/webroot/js/comment.js -
M
core/configs/configs_events.php -
M
core/configs/controllers/configs_controller.php -
M
core/contact/contact_events.php -
M
core/contact/controllers/contacts_controller.php -
M
core/events/events_events.php -
M
core/events/views/helpers/event.php -
M
core/feed/config/config.json -
M
core/feed/config/releases/000008_feed.php -
M
core/feed/config/releases/map.php -
M
core/feed/config/schema/schema.php -
M
core/feed/views/elements/modules/latest_news.ctp -
M
core/filemanager/controllers/filemanager_controller.php -
M
core/google/views/helpers/chart.php -
M
core/google/views/helpers/static_map.php -
M
core/installer/controllers/install_controller.php -
M
core/installer/installer_events.php -
M
core/installer/models/plugin.php -
M
core/installer/webroot/img/icon.png -
M
core/libs/config/images.php -
M
core/libs/controllers/components/infinitas.php -
M
core/libs/controllers/components/mass_action.php -
M
core/libs/libs_events.php -
M
core/libs/models/datasources/reader_source.php -
M
core/libs/views/infinitas.php -
M
core/libs/views/lazy_helper.php -
M
core/locks/controllers/components/locker.php -
M
core/locks/controllers/locks_controller.php -
M
core/locks/locks_events.php -
M
core/locks/models/behaviors/lockable.php -
M
core/locks/views/locks/admin_locked.ctp -
M
core/management/controllers/ip_addresses_controller.php -
M
core/management/controllers/management_controller.php -
M
core/management/controllers/pages_controller.php -
M
core/management/controllers/trash_controller.php -
M
core/management/management_events.php -
M
core/menus/controllers/menu_items_controller.php -
M
core/menus/menus_events.php -
M
core/menus/models/menu.php -
M
core/menus/models/menu_item.php -
M
core/menus/views/elements/modules/admin/dashboard_icons.ctp -
M
core/menus/views/elements/modules/admin/dock.ctp -
M
core/menus/views/elements/modules/admin/menu.ctp -
M
core/menus/views/helpers/menu.php -
M
core/menus/views/menu_items/admin_form.ctp -
M
core/modules/models/module.php -
M
core/modules/models/module_position.php -
M
core/modules/modules_events.php -
M
core/modules/views/helpers/module_loader.php -
M
core/newsletter/config/config.php -
M
core/newsletter/controllers/campaigns_controller.php -
M
core/newsletter/controllers/components/emailer.php -
M
core/newsletter/controllers/newsletters_controller.php -
M
core/newsletter/controllers/templates_controller.php -
M
core/newsletter/models/campaign.php -
M
core/newsletter/models/newsletter.php -
M
core/newsletter/models/newsletters_user.php -
M
core/newsletter/models/template.php -
M
core/newsletter/newsletter_app_controller.php -
M
core/newsletter/newsletter_app_model.php -
M
core/newsletter/newsletter_events.php -
M
core/newsletter/views/campaigns/admin_form.ctp -
M
core/newsletter/views/campaigns/admin_index.ctp -
M
core/newsletter/views/helpers/letter.php -
M
core/newsletter/views/newsletters/admin_form.ctp -
M
core/newsletter/views/newsletters/admin_index.ctp -
M
core/newsletter/views/templates/admin_form.ctp -
M
core/newsletter/views/templates/admin_index.ctp -
M
core/routes/models/route.php -
M
core/routes/views/elements/route_select.ctp -
M
core/routes/views/routes/admin_form.ctp -
M
core/short_urls/config/config.json -
M
core/short_urls/config/releases/000008_short_urls.php -
M
core/short_urls/config/releases/map.php -
M
core/short_urls/config/schema/schema.php -
M
core/short_urls/controllers/short_urls_controller.php -
M
core/short_urls/models/short_url.php -
M
core/short_urls/short_urls_events.php -
M
core/tags/controllers/tags_controller.php -
M
core/tags/models/tag.php -
M
core/tags/tags_events.php -
M
core/tags/views/tags/admin_index.ctp -
M
core/themes/controllers/themes_controller.php -
M
core/themes/models/theme.php -
M
core/themes/themes_events.php -
M
core/users/controllers/components/visitor.php -
M
core/users/controllers/users_controller.php -
M
core/users/models/group.php -
M
core/users/models/user.php -
M
core/users/users_events.php -
M
core/users/views/users/admin_index.ctp -
M
core/view_counter/controllers/components/view_counter.php -
M
core/view_counter/models/behaviors/viewable.php -
M
core/view_counter/models/view_count.php -
M
core/view_counter/view_counter_events.php -
M
core/view_counter/views/elements/modules/admin/popular_items.ctp -
M
core/webmaster/controllers/robots_controller.php -
M
core/webmaster/controllers/webmaster_controller.php -
M
core/webmaster/webmaster_events.php -
M
developer -
M
plugins/backlinks -
M
plugins/blog -
M
plugins/cms -
M
plugins/debug_kit -
M
plugins/facebook -
M
plugins/gallery -
M
plugins/thickbox -
M
plugins/twitter -
M
views/layouts/admin.ctp -
M
webroot/test.php