de9654deec
[FIX] website_mail: default could be None
2014-06-10 16:57:54 +02:00
ddaac15f48
[FIX] website_mail: backport of master fix a54caabbcb
2014-06-10 16:48:19 +02:00
e02759a58e
[FIX] website_mail: fixed template choice and body duplication in the email designer that was buddy; added some css to the page to make it more look like an email designer; also added a demo data for a template for mass mailing contacts in mass_mailing module.
2014-06-03 10:56:05 +02:00
46712acaec
[FIX] bunch of changes lost in incorrect merge f4d78ae738
2014-05-30 17:00:52 +02:00
d325c0caef
[REV] attempt to revert incorrect removals in f4d78ae738
2014-05-30 16:00:28 +02:00
0b54d8fb3c
[FIX] website_mail_group: fixed discussion group data, wrongly forward-ported
2014-05-30 11:22:00 +02:00
248107d11a
[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group
2014-05-29 01:59:47 +02:00
c9e12161c9
[FIX] website_mail.editor.js moved but still referenced
...
Commit 0c89ca0f8f
2014-05-28 23:13:38 +02:00
e276ac33f6
[MERGE] Forward-port saas-4 up to bf135ad
2014-05-28 17:45:31 +02:00
0c89ca0f8f
[FIX] website_mail, websit_mail_group: moved discussion group snippet to the right module; it should not be available when the mailing list archives module is not installed. Also fixed get_alias_info route to be mail_group specific and to avoid allowing people to browse the database.
2014-05-28 11:12:33 +02:00
02018563b3
[FIX] website_mail: fixed is_follower controller, that could leak data about records.
...
Added instead a controller to get alias data. This controller is called by the
discussion group snippet to have the info about the alias.
2014-05-28 09:59:31 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
0544fc2929
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
...
This reverts commit dd900408de4da882d48f
2014-05-27 16:12:52 +02:00
61d27543c5
[CLEAN] website_mail: cleaned a lost console.log and a commented line that should have been removed with pr 213
2014-05-27 15:35:17 +02:00
1744208928
Changed xpath expression from /t to .
2014-05-27 10:45:07 +02:00
ef2c068ec3
[IMP] website_mail: improved snippet to subscribe to a mail.group.
...
Main modifications :
- layout: input - button when not following, links (email - archives - unsubscribe) when following
- when adding your email, update all other subscribe snippets input in the page to avoid havign to re-type it
- management of fields of the record to subscribe to, used to have access to the alias of the group
2014-05-27 08:54:37 +02:00
daba406886
[IMP]Move assetss to frontend template.
2014-05-23 18:31:01 +05:30
b7c6b1cbca
[FIX] website_mail: message description should effectively be limited to the first 30 characters.
2014-05-21 16:27:17 +02:00
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +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
da20dc9899
[IMP] website_mail: rename newsletter mail group to discussion group
...
to avoid confusion with mass mailing mailing lists and newsletters.
bzr revid: tde@openerp.com-20140509125118-obvdjkgreyiez8k9
2014-05-09 14:51:18 +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
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
f299180399
[FIX] website_mail: request.website.user_id.id
...
bzr revid: chm@openerp.com-20140502092659-1gwsx6lmgmtcf80q
2014-05-02 11:26:59 +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
c92e1b6bcb
[IMP] Rename assets_frontend
...
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
eae846f2c8
[FIX] remove @translatable conditions and de-activate group_website_designer specifics
...
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion
bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
13469c23d8
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
74d4d1f58d
[CHG] bundlify website
...
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.
bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
7b413e4aff
[FIX] Mail snippet - Set generic URL
...
bzr revid: jke@openerp.com-20140417115621-c0j2nj4srlshougy
2014-04-17 13:56:21 +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
68312cf9f8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r
2014-04-15 11:39:54 +02:00
bafa8e448d
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
...
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
2014-04-14 16:30:01 +02:00
55266ab25d
[MERGE] Merged fp's refactoring branch.
...
bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj
2014-04-14 15:11:09 +02:00
3db3160644
[IMP] website_link field removed
...
bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
2014-04-13 22:46:25 +02:00
8d6e2b4a15
[iMP] minor bugfixes
...
bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
2014-04-13 21:57:30 +02:00
f908137d76
[IMP] Template Editor
...
bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
2014-04-13 18:20:28 +02:00
7298130f31
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
8178669795
[FIX] mail, mass_mailing
...
- mail: now trigger postprocess_sent_message in every case, being sent or not, as the state
is propagated in the method; udpated all addons accordingly;
- email_template: fixed URL to edit it in website + form view;
- mass_mailing: barchart now send jsonified value;
- mass_mailing: tweaking the form view with all options
bzr revid: tde@openerp.com-20140408124053-o9tb14k6v47s5mjd
2014-04-08 14:40:53 +02:00
e3d31b5dce
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140408083418-0gn78r4ueg7tyu0v
2014-04-08 10:34:18 +02:00
271e805cb8
[IMP] mass_mailing: new refactoring of the way the body is managed
...
- now body_html is a right field on mass_mailing, editable using the website
- email_designer controller / template now works on everything that has a body
receiving its model and res_id as post parameters; it does not work only on
email tempaltes anymore
- cleaning of the mass mailing form view: reply_to managment option (either
replied go into the document, either there is a specified reply_to; it is implemented
using boolean fields instead of a selection because all options are not available
for all models ... models like contact or partner do not have a chatter or
shoudl be be used for a chatter-like use)
- send to all now instantiates a mail.compose.message; the mass mailign processing
is delegated to the wizard itself.
bzr revid: tde@openerp.com-20140407170346-hpklabi513xskd07
2014-04-07 19:03:46 +02:00
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
9553c48a8b
[FIX] website_mail: force the copy method not to copy website_message_ids field, we do not want duplicated emails (opw 605975).
...
bzr revid: mat@openerp.com-20140402123707-r3e38b64zsheq0tn
2014-04-02 14:37:07 +02:00
f22169ebfb
[FIX] website_mail: overwritten _search method created domains syntactically not correct + security rule was applied on superuser
...
bzr revid: dle@openerp.com-20140402093721-hwcdwltbkict4oz4
2014-04-02 11:37:21 +02:00
Jonathan Nemry
Martin Trigaux
Thibault Delavallée
Xavier Morel
Olivier Dony
Fabien Meghazi
Mitesh Savani
Christophe Simonis
chm@openerp.com
Antony Lesuisse
Christophe Simonis
Kersten Jeremy
Fabien Pinckaers
Denis Ledoux