Changeset [888013e6024b0b691621de2e12c0e40f8bdf3654] by dogmatic69
Revision 888013e6024b0b691621de2e12c0e40f8bdf3654,
committed by dogmatic69
· October 18th, 2010 @ 03:28 PM
Merge branch 'dev-newsletter' into dev
http://github.com/infinitas/infinitas/commit/888013e6024b0b691621de...
42 changed files
-
A
core/emails/attachments/empty -
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/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 -
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 -
M
.gitignore -
M
core/libs/controllers/components/mass_action.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/views/helpers/letter.php