Commit Graph

164 Commits

Author SHA1 Message Date
Thibault Delavallée cafaf60552 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140326092649-nihnbi9wv8j07jth
2014-03-26 10:26:49 +01:00
chm@openerp.com 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Thibault Delavallée 6af6575efb [IMP] website_mail: added not stored function field
on mail.message that is a short description of the message, either
the subject if present, of the beginning of the plain-text version
of the body. Used whenever messages 'subject' for all messages
is necessary.

bzr revid: tde@openerp.com-20140320151004-qq57s9r8qcpue0rs
2014-03-20 16:10:04 +01:00
Thibault Delavallée b484da7e73 [FIX] [IMP] website_mail: improved and fixed the 'subscribe button'.
This button is used to perform a 'message_subscribe' or 'message_unsubscribe' on some
documents. It is notably used to add a 'Subscribe' button in some pages that subscribe
the user to a mailing list (aka mail.group).
This branch fixes some subscribe/unsubscribe issues, better manages the public user,
use the session to remember whether a public user has subscribe to a mailing list,
and uses already-existing code to manage partners.

bzr revid: tde@openerp.com-20140319113129-qd2bok52hvf1ybiu
2014-03-19 12:31:29 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
chm@openerp.com 3624a3beb2 [IMP] website_mail: refactor follow button; add partner_id in session for public user
bzr revid: chm@openerp.com-20140318101505-4yivw8h5oujyhm9b
2014-03-18 11:15:05 +01:00
Fabien Pinckaers d143e09ff5 [IMP] Mailing List Fixes
bzr revid: fp@tinyerp.com-20140316123220-5hq7e3f6p7fzbr96
2014-03-16 13:32:20 +01:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
Fabien Pinckaers 55ec0feba2 [IMP] Subscribe data
bzr revid: fp@tinyerp.com-20140313194801-24f5f9s03rk663d6
2014-03-13 20:48:01 +01:00
Olivier Dony 3f7d176a55 [FIX] website_mail: very expensive copy/paste typo
bzr revid: odo@openerp.com-20140311155309-bs0frntkkhym8e2o
2014-03-11 16:53:09 +01:00
chm@openerp.com 53f59c16d6 [MERGE] from trunk
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
chm@openerp.com 9ee5a6d0a1 [FIX] website_mail: remove frontend js and css from __openerp__
bzr revid: chm@openerp.com-20140310143055-nfrk745uth835qu7
2014-03-10 15:30:55 +01:00
chm@openerp.com b6b0a26777 [FIX] website_mail
bzr revid: chm@openerp.com-20140306143856-1b9q9zhgqtwr6brf
2014-03-06 15:38:56 +01:00
chm@openerp.com 5f3f09329f [IMP] website: snippet : website.snippet.animationRegistry.follow
bzr revid: chm@openerp.com-20140306140323-o2e77a66eu28bddu
2014-03-06 15:03:23 +01:00
chm@openerp.com 73446943f5 [FIX] website snippet: clean_for_save; display email in subscribe snippet
bzr revid: chm@openerp.com-20140306134746-oi0p580c3s3t2a24
2014-03-06 14:47:46 +01:00
chm@openerp.com 58a5f90758 [IMP] website: dynamic website_mail snippet with js
bzr revid: chm@openerp.com-20140306130240-cpsd5mssziuvrpf8
2014-03-06 14:02:40 +01:00
chm@openerp.com 7cf77276fb [IMP] website snippet: add Configurable follow snippet
bzr revid: chm@openerp.com-20140305175411-in3oodk778dxvu0k
2014-03-05 18:54:11 +01:00
Thibault Delavallée db2bdee343 MERGE] [FIX] email_template: fix relative -> absolute url conversion
Local URLs are converted into absolute URLs, notably because when using the
email designer, images are added using local URLs. Previously to this fix
the template was analyzed to find local URLs and make them absolute.
However this causes 2 issues :
- mako-based URLs are broken because a scheme is added before the mako that
generated the image src
- when changing the base url, the templates are not updated
The URLs are now converted dynamically when generating the content of the
html. This is done by passing a new parameter that enable the post processing
of the generated content.
Also fixed double body generation when using templates; fields parameter
was not propagated correctly.

bzr revid: tde@openerp.com-20140304112957-l9b10gyjqphs5fgc
2014-03-04 12:29:57 +01:00
Thibault Delavallée d417da6c1a [MERGE] Sync with saas-3
bzr revid: tde@openerp.com-20140303110400-arkw9yciv4eopb5a
2014-03-03 12:04:00 +01:00
Thibault Delavallée 05fdc2290a [IMP] email_template: relocate url rewritign stuff directly into the rendering method.
bzr revid: tde@openerp.com-20140303104044-hgmii31ga6msf72z
2014-03-03 11:40:44 +01:00
Christophe Simonis a5fc14193d [FIX] website_mail: forbid access to email_designer routes to public user
bzr revid: chs@openerp.com-20140228151544-ipoih9c924rsbqi1
2014-02-28 16:15:44 +01:00
Thibault Delavallée a9a4767d17 [FIX] email_template :
- fixed composer using template that were rendering the body twice, once form the template and
once from the composer body. Only the latter one is used, so avoid generating the template body
that is not necessary
- fixed email_template generating values for a set of given fields, ignoring the field list
given into parameter
- fixed post processing of templates to transform local urls into absolute urls; now urls are
transformed after body generation, when sending email based on templates , or when generating
the content when using the composer.

bzr revid: tde@openerp.com-20140227153835-gmqnxrzed9fnbxhm
2014-02-27 16:38:35 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Olivier Dony ea5d111166 [IMP] website_mail: avoid marking old messages as published
There is semantically no reason to publish old
messages, and doing so can be expensive for large
databases. Defaulting new messages to published
makes sense depending on the model on which they
are attached, so it might be better to improve
this as an opt-in handled in create() or
message_post() or via default_* context keys.

bzr revid: odo@openerp.com-20140217142006-ik18uqy9ewhhhb42
2014-02-17 15:20:06 +01:00
Thibault Delavallée c02a510889 [IMP] website_mail: email designer: improved template + link to backend
bzr revid: tde@openerp.com-20140207102124-5joee7c201fmxizu
2014-02-07 11:21:24 +01:00
Thibault Delavallée d26919f73e [IMP] website_mail: reordered email snippets, added 2 and 3 columns in basic email structures
bzr revid: tde@openerp.com-20140207091907-6brx7m2i69mo9ow0
2014-02-07 10:19:07 +01:00
Thibault Delavallée 1e2452fb1a [IMP] website_mail: email designer snippets categories better explained, to avoid
confusion with the classic html editor

bzr revid: tde@openerp.com-20140207084137-zk2o3nn7ml84axa6
2014-02-07 09:41:37 +01:00
Thibault Delavallée 989a4f3103 [FIX] website_mail: also depends on email_template
bzr revid: tde@openerp.com-20140206145524-bafdhe3gc62oya2c
2014-02-06 15:55:24 +01:00
Thibault Delavallée 93a5122ac5 [IMP] website_mail: improve email_template link for front-end edition didsplay
bzr revid: tde@openerp.com-20140206145510-y4mangyhhmwcofa7
2014-02-06 15:55:10 +01:00
Olivier Dony a09fa10c49 [FIX] website_mail: useless and expensive DISTINCT
bzr revid: odo@openerp.com-20140129162532-os3lzjyf87hg1ouc
2014-01-29 17:25:32 +01:00
Christophe Matthieu b7f88a58fb [FIX] website:_mail: fix followers
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
2014-01-29 18:08:29 +01:00
Antony Lesuisse beb15c52ab [FIX] Softwares is made of datas and codes
bzr revid: al@openerp.com-20140126204334-4ggfsn31zp1yndix
2014-01-26 21:43:34 +01:00
Stephane Wirtel f27237b8dd [FIX] Set the auto_install flag to False
bzr revid: stw@openerp.com-20140123102632-2zhttz8u3vh29tct
2014-01-23 11:26:32 +01:00
Christophe Matthieu 849fc19aa1 [FIX] website: import openerp.addons.website_blog.tests
bzr revid: chm@openerp.com-20140121093415-ork5jis48mmq4dp8
2014-01-21 10:34:15 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
2014-01-20 16:37:33 +01:00
Thibault Delavallée 54ee20cbd0 [IMP] website_mail: tmeplate editor: improved tmeplate of the pag
- removed an unnecessary oe_structure in head of the page
- added a position: relative on the body_html field because otherwise
there are ugly violet bars

bzr revid: tde@openerp.com-20140115151706-pwy0jjgce955ttth
2014-01-15 16:17:06 +01:00
Thibault Delavallée 6072e586f4 [FIX] website_mail: email_template: fixed lxml/etree adding a div
outside of the html content, breaking the snippets-based editor.

bzr revid: tde@openerp.com-20140115151644-0cei3chdl5op2flr
2014-01-15 16:16:44 +01:00
Thibault Delavallée 7a9bafc39c [CLEAN] website_mail: template designer: cleaned a bit the snippets to remove section tag
bzr revid: tde@openerp.com-20140115091738-q0gpxqpn80m9r1sd
2014-01-15 10:17:38 +01:00
Thibault Delavallée cb26621d2b [IMP] website_mail: template designer: improved button snippet
bzr revid: tde@openerp.com-20140114173629-zfxili82zn6zi6yv
2014-01-14 18:36:29 +01:00
Thibault Delavallée 5be1dfda6e [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140114171738-zz4apq7nk5dcov0i
2014-01-14 18:17:38 +01:00
Thibault Delavallée 0aa495f5cb [IMP] website_mail: improved email template snippets + added comparison / three columns / big pictures + some improvements in the page layout of template designer
bzr revid: tde@openerp.com-20140114171715-akbkj9x8ls8i5phf
2014-01-14 18:17:15 +01:00
Christophe Matthieu 9e0df88d7a [ADD] website_mail: css
bzr revid: chm@openerp.com-20140114111607-as9mmdjcyqo2nrnh
2014-01-14 12:16:07 +01:00
Thibault Delavallée 4ec71cd82b [ADD] website_mail: template designer: added some snippets for template design
bzr revid: tde@openerp.com-20140113180051-dqtzzn9mrya0ythq
2014-01-13 19:00:51 +01:00
Thibault Delavallée cbbe82a4a1 [MERGE] Sync with main website-al branch
bzr revid: tde@openerp.com-20140113134937-kijvjjne6grov61c
2014-01-13 14:49:37 +01:00
Thibault Delavallée b97727701c [IMP] [ADD] website: added base for template designer.
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
2014-01-13 13:55:34 +01:00
Christophe Matthieu f927506bfc [FIX] website_mail: follow/subscribe button
bzr revid: chm@openerp.com-20140113110542-jkb13xfiy3tno50n
2014-01-13 12:05:42 +01:00
Christophe Matthieu ee370a837c [IMP] website: Removing unnecessary spaces at beginning of line
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00