odoo/addons/mass_mailing
Xavier Morel f4d78ae738 Merge branch 'server-trunk'
Conflicts:
	addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
..
controllers [FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user() 2014-05-12 12:39:35 +02:00
data [IMP] mass_mailing: added newsletter as mailing list data + imported contact still demo data 2014-05-09 14:53:58 +02:00
doc [ADD] mass_mailing: added directories + skeletons for doc and tests 2013-09-06 12:33:25 +02:00
models [TYPO] mass_mailing: rename wrongly named function field (dayly -> daily). 2014-04-29 18:54:30 +02:00
security [REM] mass_mailing: removed report, a graph view on statistics will be sufficient 2014-04-15 11:58:17 +02:00
static [IMP] subscribe to group / newsletter widgets: wording cleaning 2014-05-09 15:21:56 +02:00
tests [ADD] mass_mailing: added directories + skeletons for doc and tests 2013-09-06 12:33:25 +02:00
views Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w) 2014-05-12 09:23:31 +02:00
wizard [FIX] mass_mailing: fixed test mailing wizard, still using unsubscribe url that is 2014-04-17 14:26:33 +02:00
__init__.py [REF] mass_mailing: moved files in models/data/views directories. 2014-03-17 15:32:31 +01:00
__openerp__.py Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w) 2014-05-12 09:23:31 +02:00