Commit Graph
141 Commits
Author SHA1 Message Date
Olivier Dony 26abbf676d [FIX] website_mail: remove unused alert div, fixes look of input-group-btn
Bootstrap's CSS depends on the input-group-btn
element being the first/last child of its parent.
This was not the case because of the invisible
and useless alert.
2015-03-27 17:23:04 +01:00
Christophe Matthieu 421693d952 [FIX] website_mail: text block: padding at 0, it is not aligned with texts in other blocks 2015-03-23 12:25:05 +01:00
Christophe Matthieu 70c30fe5b1 [IMP] website_mail: improved template designer, added support for background color, font color and convert class to inline style in mail designer, changed snippet according to new format, added theme selector in mail_designer, added font-awesome support (convert in image) in mail snippets 2015-02-12 11:58:13 +01:00
Julien De Coster d88c34d11e [IMP] Mass mailings send in cron
1. The merge of the "email_template" module into the "mail" module.
2. The send action of the mass mailing has been moved from the frontend to a cron, because it was too slow to send over 10,000 mails (the user's browser was blocked for 15 - 20 minutes). Mass mailings have now their own process in the kanban view.
3. Mails sent from the mail form are sent immediatly instead of from the mail queue (for instance, when you go to sales > customers > list view > select 2 -3 customers > More > Partner Mass Mailing).
4. Users have now the choice from which mailing list they want to unsubscribe when they click on the unsubscribe link at the bottom of the mail.
5. Mass mailings inherit from their campaign UTMs and mass mailing campaigns are linked to an UTM campaign.
6. Many little improvements
2015-01-07 18:01:58 +01:00
Christophe Simonis 1d3f8eba87 [MERGE] forward port of branch 8.0 up to 591e329 2014-12-02 16:18:08 +01:00
Ravi Gohil 1fe6e8172d [IMP] website_mail: mailing editor buttons
Button "Save and continue" was wrongly named as it worked only once the template
is not in edit mode (so already saved).
Hide the button to only get it in readonly mode and rename it for better
understanding of its purpose. (opw 614563)
2014-12-01 11:45:43 +01:00
Christophe Simonis 4b6c948be5 [MERGE] forward port of branch 8.0 up to ed92589 2014-10-23 17:14:35 +02:00
David Monjoie bf3251fd0a [IMP] website_mail: actually render the html body of the template instead of escaping it 2014-10-23 11:26:43 +02:00
Ajay Patel 606e29c733 [FIX] website_mail: "save and continue" button 2014-10-06 10:46:35 +02:00
Christophe Simonis 709c9868de [MERGE] forward port of branch 8.0 up to e883193 2014-10-01 19:18:14 +02:00
Denis Ledoux a0625b3384 [FIX] website_mail: t-field replace by t-esc as html_sanitize applied on the field 2014-09-29 15:03:13 +02:00
Denis Ledoux 03af44babe [FIX] website_mail: sanitize email templates when displaying templates selection
In cases the templates is not html syntax valid
2014-09-29 14:57:36 +02:00
Christophe Matthieu 6048e883e8 [FIX] snippets: use the new API to define dropzone 2014-09-19 12:13:32 +02:00
Christophe Matthieu 1f964d2693 [FIX] website_mail: can't be edit the mail template, javascript must be added into the asset 2014-09-19 11:47:49 +02:00
Fabien Meghazi 8d08e06758 [FIX] Bundlification remains (Fixes #2463) 2014-09-17 14:50:12 +02:00
Christophe Matthieu 1b0031c524 [IMP] website.snippet: create automatically the thumbnail; data-option became data-js; add data-eval method; rename check_class into toggle_class 2014-08-27 12:20:14 +02:00
Christophe Matthieu 239b6bc0b5 [IMP] website snippet new option, gallery
website.snippet: The methods described in javascript will be called automatically from the data-method_name = value on li snippets options. The methods are called in the order relative to children of xml (eg: <li data-method1=value1> ... <li data-method2=value2> ... </ li>, the method1 is then called method2). Methods receive two arguments: type (over, click, reset) and value. data-snippet-id-option becomes data-snippet-id. Several xml options can use the same data-snippet-id.

add a new gallery snippet

convert website_sale to the new option system
2014-08-21 18:02:14 +02:00
Olivier Dony a1f307b489 [FIX] snippets: avoid orphan full stop (.) 2014-07-30 13:24:39 +02:00
Denis Ledoux a5f7891b68 [MERGE] forward port of branch saas-4 up to 5739aebfb1 2014-07-23 13:18:30 +02:00
Olivier Dony 6ac1deccf6 [FIX] mail, website_mail: specific mailing-list footer + better unsubscribe option
- remove the default footer for mail.group messages,
  replace with specific footer with archive and unsubscribe
  link
- remove the automatic addition of user signature in
  mail.group messages, as many of them will be posted
  via the mail gateway and already contain a user signature.
- make it easier to unsubscribe even when not logged in,
  as followers who have not signed up will have no
  way to login short of signing up.
- remove tests looking for user signature in mail.group posts
2014-07-16 23:21:30 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Thibault Delavallée b07b8a5b1f [FIX] website_mail: restored follow JS code that was wrongly merged with the mail group follow snippet. Now both widget animation exists, the second being more complex and therefore requiring a different animation. 2014-06-19 09:33:36 +02:00
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
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
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 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 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
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
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