f4d78ae738
Merge branch 'server-trunk'
...
Conflicts:
addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
4cecbd919f
[FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user()
...
This method was (partially) removed at rev.9421
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a
bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
2014-05-12 12:39:35 +02:00
555d4879c8
Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)
...
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
2014-05-12 09:23:31 +02:00
6f60eb218f
[IMP] subscribe to group / newsletter widgets: wording cleaning
...
bzr revid: tde@openerp.com-20140509132156-qbmop9au07cllgkk
2014-05-09 15:21:56 +02:00
4c4d610336
[IMP] mass_mailing: added newsletter as mailing list data + imported contact still demo data
...
bzr revid: tde@openerp.com-20140509125358-2kjc462ttrnxmpxm
2014-05-09 14:53:58 +02:00
59b9344bab
[IMP] website_mail, mass_mailing: icon in editor for the snippets + renaming
...
bzr revid: tde@openerp.com-20140507090029-fh312buk013t1gdp
2014-05-07 11:00:29 +02:00
6c8db2ce68
[ADD] mass_mailing: add a snippet to allow subscribing to a contact list (newsletter)
...
bzr revid: tde@openerp.com-20140506145145-qvncr41sdmplc0bp
2014-05-06 16:51:45 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
f38387820d
[TYPO] mass_mailing: rename wrongly named function field (dayly -> daily).
...
[FIX] mass_mailing: add `oldname` attribute to some renamed fields.
[FIX] mass_mailing: replace int field with many2one field to enforce fkey
bzr revid: chs@openerp.com-20140429165430-6w4xplwr4c5ymi1j
2014-04-29 18:54:30 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
96b9d8b9d5
[FIX] mass_mailing: avoid using werkzeug API only present in 0.9+
...
bzr revid: odo@openerp.com-20140424131451-rhtokro13piol7ji
2014-04-24 15:14:51 +02:00
a32ccdbbd1
[FIX] mass_mailing: fixed test mailing wizard, still using unsubscribe url that is
...
now delegated on the mail_mail model.
bzr revid: tde@openerp.com-20140417122633-bej72c8yhv2y2y4z
2014-04-17 14:26:33 +02:00
ffc7bccef9
[IMP] removes an useless button_box in addon mass mailing to allow the stat button contained inside to be aligned properly (addon mass mailing)
...
bzr revid: ged@openerp.com-20140417094543-03q0sxu0jqpdva0k
2014-04-17 11:45:43 +02:00
d264cd1640
[IMP] website_mail: make the template / mail editor work. We now have a limited
...
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.
Also fixed editor not being actiated when going into the body edition.
bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
2014-04-16 12:59:01 +02:00
fe8a745b02
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
2014-04-16 10:29:25 +02:00
4336c64a7c
[IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
...
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.
bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2
2014-04-16 10:28:51 +02:00
c5627c4d3f
[FIX] mass_mailing: fixed issue when generating unsubscirbe urlé
...
bzr revid: tde@openerp.com-20140415160743-5i0pjieo4o031ico
2014-04-15 18:07:43 +02:00
f7d7e34467
[REM] mass_mailing: removed now dead code
...
bzr revid: tde@openerp.com-20140415154754-60uvhxt8ho78pdqd
2014-04-15 17:47:54 +02:00
3eaeae55a0
[IMP] mail, mass_mailing: better recipientsz computation
...
for mass mailing, composer and template. This allows to have one method computing recipints
and avoid repetiting myself.
bzr revid: tde@openerp.com-20140415154700-zu2izvxfjq1k4h4a
2014-04-15 17:47:00 +02:00
7ffffe6889
[FIX] mass_mailing: fixed demo data
...
bzr revid: tde@openerp.com-20140415135846-ql9883kwc3skqelo
2014-04-15 15:58:46 +02:00
19a2f350fa
[IMP] mass_mailing: cleaned demo data
...
bzr revid: tde@openerp.com-20140415135157-blrw8vcv66nzs6wa
2014-04-15 15:51:57 +02:00
da7cb60cfc
[MOVE] Moved mass mailing chardomain widget to web.
...
bzr revid: tde@openerp.com-20140415133933-1uqlj3yujdwozz2m
2014-04-15 15:39:33 +02:00
4808ca3796
[FIX] mass_mailing: various fixed in chardomain widget
...
bzr revid: tde@openerp.com-20140415125222-uzvzgzo5gx6hmgor
2014-04-15 14:52:22 +02:00
ea2e59f86b
[FIX] mass_mailing: fixed email sending
...
bzr revid: tde@openerp.com-20140415113944-hjwjc2lh4ydzugr1
2014-04-15 13:39:44 +02:00
4aa717b695
[FIX] mass_mailing: form view: usability imp
...
bzr revid: tde@openerp.com-20140415113934-xu033xxibolvl62w
2014-04-15 13:39:34 +02:00
7e1e475d89
[IMP] mass_mailing :handle attachments for mailings
...
bzr revid: tde@openerp.com-20140415110439-j72v9cnz3nml7g04
2014-04-15 13:04:39 +02:00
922e8b610f
[IMP] mass_mailing :improved demo data
...
bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132
2014-04-15 12:43:37 +02:00
d538a02c0e
[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation
...
bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc
2014-04-15 12:43:28 +02:00
1e643d4ce5
[FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed
...
bzr revid: tde@openerp.com-20140415102818-zcm9vfc7zalg29f4
2014-04-15 12:28:18 +02:00
90d9b497b3
[FIX] mass_mailing: various fixes in campaign view and basic management
...
bzr revid: tde@openerp.com-20140415101342-7vvadykp1udz6hgs
2014-04-15 12:13:42 +02:00
35d51fe71f
[REM] mass_mailing: removed report, a graph view on statistics will be sufficient
...
bzr revid: tde@openerp.com-20140415095817-rx7bokd6qc5rkrhq
2014-04-15 11:58:17 +02:00
6179d9b6a2
[IMP] mass_mailing: finishing refactoring for the new func flow.
...
- cleaned reply-to management, now displaying an alert but simplifying the underlying
model about options available / not available for certain documents;
- cleaned a bit the form view;
- date -> create_date, and added a sent_date to distinguish the two;
- removed dead code;
- first draft of improving the chardomain widget
bzr revid: tde@openerp.com-20140415092503-q1hku1rh12ldy9i1
2014-04-15 11:25:03 +02:00
48d7a6fa6c
[CLEAN] mass_mailing: rmeoved dead stuff
...
bzr revid: tde@openerp.com-20140414144011-awu4g35etq9s4gje
2014-04-14 16:40:11 +02:00
55266ab25d
[MERGE] Merged fp's refactoring branch.
...
bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj
2014-04-14 15:11:09 +02:00
a0b26b6cfe
[FIX] mass_mailing: mail_thread model redefined as a osv.Model, while the original mail thread is an AbstractModel. Mass mailing mail thread must be an Abstract Model as well
...
bzr revid: dle@openerp.com-20140414090825-o456mdd9q38m47mw
2014-04-14 11:08:25 +02:00
34e618965a
[IMP] commment
...
bzr revid: fp@tinyerp.com-20140414081035-9ixrag5oly2q0emb
2014-04-14 10:10:35 +02:00
8d42202c92
[FIX] show stages only if campaign is set
...
bzr revid: fp@tinyerp.com-20140413205337-kkr9xtk6x5bzvzo5
2014-04-13 22:53:37 +02:00
57078f5c12
[IMP] features
...
bzr revid: fp@tinyerp.com-20140413203634-75mf4z8o3xh7i83h
2014-04-13 22:36:34 +02:00
96a750fd03
[IMP] Removing featuer
...
bzr revid: fp@tinyerp.com-20140413203309-digp60hsobgv3i57
2014-04-13 22:33:09 +02:00
2ad0b6e369
[IMP] removing unused code
...
bzr revid: fp@tinyerp.com-20140413202922-glv198j62sqeugz2
2014-04-13 22:29:22 +02:00
b1ccd56368
[IMP] better usability
...
bzr revid: fp@tinyerp.com-20140413201748-u8e26ef40dt7360i
2014-04-13 22:17:48 +02:00
f908137d76
[IMP] Template Editor
...
bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
2014-04-13 18:20:28 +02:00
cb544e61c4
[IMP] default recipients to mailing list
...
bzr revid: fp@tinyerp.com-20140413070922-jw7f5s9wrt9g2gek
2014-04-13 09:09:22 +02:00
84fe98085b
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412233019-au2omxtet5sfqcxr
2014-04-13 01:30:19 +02:00
227b9a917d
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412232548-csyb7j13fyu4cwnw
2014-04-13 01:25:48 +02:00
e9cf53934b
[iMP] small improvements
...
bzr revid: fp@tinyerp.com-20140412232159-1y35hdpaahy633tb
2014-04-13 01:21:59 +02:00
3df4eb0f72
[WIP] Mailing Lists and Contacts cleaned
...
bzr revid: fp@tinyerp.com-20140412203129-5l7w4qr8rf2d1nqo
2014-04-12 22:31:29 +02:00
2feab20dbb
[WIP] started to reduce code
...
bzr revid: fp@tinyerp.com-20140412153339-rr3b1r4cmdeigp0v
2014-04-12 17:33:39 +02:00
915ac89024
[merge]
...
bzr revid: fp@tinyerp.com-20140412130132-6dncdvhrxsciyr7l
2014-04-12 15:01:32 +02:00
Xavier Morel
Olivier Dony
Martin Trigaux
Thibault Delavallée
Gery Debongnie
Antony Lesuisse
Christophe Simonis
Fabien Meghazi
Denis Ledoux
Fabien Pinckaers