odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
94,425 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

266 Commits

Author SHA1 Message Date
Thibault Delavallée 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
Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738 2014-05-30 17:00:52 +02:00
Xavier Morel d325c0caef [REV] attempt to revert incorrect removals in f4d78ae738 2014-05-30 16:00:28 +02:00
Thibault Delavallée 0b54d8fb3c [FIX] website_mail_group: fixed discussion group data, wrongly forward-ported 2014-05-30 11:22:00 +02:00
Olivier Dony 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
Fabien Meghazi c9e12161c9 [FIX] website_mail.editor.js moved but still referenced 
Commit 0c89ca0f8f moves
website_mail.editor.js but is still referenced in website_mail.xml
 2014-05-28 23:13:38 +02:00
Olivier Dony e276ac33f6 [MERGE] Forward-port saas-4 up to bf135ad 2014-05-28 17:45:31 +02:00
Thibault Delavallée 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
Thibault Delavallée 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
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Fabien Meghazi 0544fc2929 Revert "Merge pull request #225 from odoo-dev/master-frontend-assets" 
This reverts commit dd900408de, reversing
changes made to 4da882d48f.
 2014-05-27 16:12:52 +02:00
Thibault Delavallée 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
Fabien Meghazi 1744208928 Changed xpath expression from /t to . 2014-05-27 10:45:07 +02:00
Thibault Delavallée 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
Mitesh Savani daba406886 [IMP]Move assetss to frontend template. 2014-05-23 18:31:01 +05:30
Thibault Delavallée b7c6b1cbca [FIX] website_mail: message description should effectively be limited to the first 30 characters. 2014-05-21 16:27:17 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Fabien Meghazi 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
Martin Trigaux 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
Thibault Delavallée 6f60eb218f [IMP] subscribe to group / newsletter widgets: wording cleaning 
bzr revid: tde@openerp.com-20140509132156-qbmop9au07cllgkk
 2014-05-09 15:21:56 +02:00
Thibault Delavallée 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
Thibault Delavallée 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
chm@openerp.com ee16b014b1 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
 2014-05-02 11:51:32 +02:00
chm@openerp.com f299180399 [FIX] website_mail: request.website.user_id.id 
bzr revid: chm@openerp.com-20140502092659-1gwsx6lmgmtcf80q
 2014-05-02 11:26:59 +02:00
Antony Lesuisse 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
Fabien Meghazi c92e1b6bcb [IMP] Rename assets_frontend 
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
 2014-04-29 16:57:45 +02:00
Fabien Meghazi 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
Fabien Meghazi 4f16d15120 [IMP] rename editor assets 
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
 2014-04-25 12:17:53 +02:00
chm@openerp.com 13469c23d8 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
 2014-04-24 15:58:41 +02:00
Christophe Simonis 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
Fabien Meghazi 1d8400418e [MERGE] upstream 
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
 2014-04-23 14:37:44 +02:00
Fabien Meghazi 0ec498371e [FIX] translatable condition on *.editor.js assets 
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
 2014-04-22 16:16:56 +02:00
Xavier Morel 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
Kersten Jeremy 7b413e4aff [FIX] Mail snippet - Set generic URL 
bzr revid: jke@openerp.com-20140417115621-c0j2nj4srlshougy
 2014-04-17 13:56:21 +02:00
Thibault Delavallée 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
Thibault Delavallée 68312cf9f8 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r
 2014-04-15 11:39:54 +02:00
Kersten Jeremy 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
Thibault Delavallée 55266ab25d [MERGE] Merged fp's refactoring branch. 
bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj
 2014-04-14 15:11:09 +02:00
Fabien Pinckaers 3db3160644 [IMP] website_link field removed 
bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
 2014-04-13 22:46:25 +02:00
Fabien Pinckaers 8d6e2b4a15 [iMP] minor bugfixes 
bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
 2014-04-13 21:57:30 +02:00
Fabien Pinckaers f908137d76 [IMP] Template Editor 
bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
 2014-04-13 18:20:28 +02:00
chm@openerp.com 7298130f31 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
 2014-04-10 17:29:25 +02:00
Thibault Delavallée 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
Thibault Delavallée e3d31b5dce [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140408083418-0gn78r4ueg7tyu0v
 2014-04-08 10:34:18 +02:00
Thibault Delavallée 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
Christophe Simonis 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
Martin Trigaux 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
Denis Ledoux 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
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
chm@openerp.com 0bae967baa [MERGE] from trunk 
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
 2014-03-12 16:48:54 +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 Matthieu 758aa20c75 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140221112742-nq2g1l3emoa2q9cz
 2014-02-21 12:27:42 +01:00
Christophe Matthieu bfeb2b9631 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
 2014-02-21 10:43:43 +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
Antony Lesuisse ff37d0ebca website sale refactor 
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
 2014-01-31 00:39:51 +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