mirror of https://github.com/OCA/social.git
[IMP] Apply pre-commit changes: Resolve conflicts
Alexandre D. Díaz
Jairo Llopis
parent
4bb026efe0
commit
32dcec55c7
|
|
@ -5,7 +5,7 @@
|
|||
"summary": "Post unkonwn messages to an existing thread",
|
||||
"version": "13.0.1.0.0",
|
||||
"category": "Discuss",
|
||||
"website": "https://www.github.com/social",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"author": "Tecnativa, Odoo Community Association (OCA)",
|
||||
"license": "AGPL-3",
|
||||
"application": False,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"author": "ForgeFlow, Odoo Community Association (OCA)",
|
||||
"license": "LGPL-3",
|
||||
"category": "Discuss",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"depends": ["mail"],
|
||||
"data": ["views/templates.xml", "views/mail_activity_views.xml"],
|
||||
"pre_init_hook": "pre_init_hook",
|
||||
|
|
|
|||
|
|
@ -23,25 +23,20 @@ odoo.define("mail.Activity.done", function(require) {
|
|||
var diff = deadline.diff(today, "days", true);
|
||||
if (diff === 0) {
|
||||
to_display = _t("Today");
|
||||
} else {
|
||||
} else if (diff < 0) {
|
||||
// This block is for overdue
|
||||
if (diff < 0) {
|
||||
// eslint-disable-line no-lonely-if
|
||||
if (diff === -1) {
|
||||
to_display = _t("Yesterday");
|
||||
} else {
|
||||
to_display = _.str.sprintf(
|
||||
_t("%d days overdue"),
|
||||
Math.abs(diff)
|
||||
);
|
||||
}
|
||||
// This block is for due
|
||||
} else if (diff === 1) {
|
||||
// eslint-disable-line no-lonely-if
|
||||
to_display = _t("Tomorrow");
|
||||
// eslint-disable-line no-lonely-if
|
||||
if (diff === -1) {
|
||||
to_display = _t("Yesterday");
|
||||
} else {
|
||||
to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff));
|
||||
to_display = _.str.sprintf(_t("%d days overdue"), Math.abs(diff));
|
||||
}
|
||||
// This block is for due
|
||||
} else if (diff === 1) {
|
||||
// eslint-disable-line no-lonely-if
|
||||
to_display = _t("Tomorrow");
|
||||
} else {
|
||||
to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff));
|
||||
}
|
||||
activity.label_delay = to_display;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,12 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
<!--
|
||||
Copyright 2018-20 ForgeFlow <http://www.forgeflow.com>
|
||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
|
||||
-->
|
||||
<template id="assets_backend" name="mail_activity_done assets" inherit_id="web.assets_backend">
|
||||
<template
|
||||
id="assets_backend"
|
||||
name="mail_activity_done assets"
|
||||
inherit_id="web.assets_backend"
|
||||
>
|
||||
<xpath expr="." position="inside">
|
||||
<script type="text/javascript" src="/mail_activity_done/static/src/js/mail_activity.js"/>
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="/mail_activity_done/static/src/js/mail_activity.js"
|
||||
/>
|
||||
</xpath>
|
||||
</template>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
"summary": "Remove Odoo branding in sent emails",
|
||||
"version": "13.0.2.0.1",
|
||||
"category": "Social Network",
|
||||
"website": "https://github.com/OCA/social/",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"author": "Tecnativa, Eficent, Onestein, Odoo Community Association (OCA)",
|
||||
"license": "AGPL-3",
|
||||
"installable": True,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"author": "Therp BV,Odoo Community Association (OCA)",
|
||||
"license": "AGPL-3",
|
||||
"category": "Discuss",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"summary": "Attach emails to Odoo by dragging them from your desktop",
|
||||
"depends": ["mail", "web_drop_target"],
|
||||
"external_dependencies": {"python": ["extract_msg"]},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
/* global base64js:false, Uint8Array:false */
|
||||
// Copyright 2018 Therp BV <https://therp.nl>
|
||||
// License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ odoo.define("mail_drop_target", function(require) {
|
|||
return this.record.res_id;
|
||||
},
|
||||
|
||||
_handle_drop_items: function(drop_items, e) {
|
||||
_handle_drop_items: function(drop_items) {
|
||||
var self = this;
|
||||
_.each(drop_items, function(item, e) {
|
||||
return self._handle_file_drop_proxy(item, e);
|
||||
|
|
@ -34,7 +34,7 @@ odoo.define("mail_drop_target", function(require) {
|
|||
reader.onerror = self.proxy("_file_reader_error_handler");
|
||||
reader.readAsArrayBuffer(file);
|
||||
},
|
||||
_handle_file_drop: function(drop_file, reader, e) {
|
||||
_handle_file_drop: function(drop_file, reader) {
|
||||
var self = this,
|
||||
mail_processor = "",
|
||||
data = "";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
<template id="assets_backend" name="mail_drop_target assets" inherit_id="web.assets_backend">
|
||||
<template
|
||||
id="assets_backend"
|
||||
name="mail_drop_target assets"
|
||||
inherit_id="web.assets_backend"
|
||||
>
|
||||
<xpath expr="." position="inside">
|
||||
<script type="text/javascript" src="/mail_drop_target/static/src/js/mail_drop_target.js"></script>
|
||||
<link rel="stylesheet" href="/mail_drop_target/static/src/css/mail_drop_target.css"/>
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="/mail_drop_target/static/src/js/mail_drop_target.js"
|
||||
/>
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="/mail_drop_target/static/src/css/mail_drop_target.css"
|
||||
/>
|
||||
</xpath>
|
||||
</template>
|
||||
</data>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
Choose if you want to automatically add new recipients as followers
|
||||
on mail.compose.message""",
|
||||
"author": "ACSONE SA/NV," "Odoo Community Association (OCA)",
|
||||
"website": "http://acsone.eu",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"category": "Social Network",
|
||||
"version": "13.0.1.0.0",
|
||||
"license": "AGPL-3",
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!--
|
||||
Copyright 2017 LasLabs Inc.
|
||||
License LGPL-3 or later (http://www.gnu.org/licenses/lgpl.html).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="ir_mail_server_form" model="ir.ui.view">
|
||||
|
|
@ -13,8 +11,8 @@
|
|||
<field name="inherit_id" ref="base.ir_mail_server_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='smtp_pass']" position="after">
|
||||
<field name="domain_whitelist"/>
|
||||
<field name="smtp_from" widget="email"/>
|
||||
<field name="domain_whitelist" />
|
||||
<field name="smtp_from" widget="email" />
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
"author": "Therp BV,Creu Blanca,Odoo Community Association (OCA)",
|
||||
"license": "AGPL-3",
|
||||
"category": "Social Network",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"summary": "Define a domain from which followers can be selected",
|
||||
"depends": ["mail"],
|
||||
"data": ["data/ir_config_parameter.xml", "data/ir_actions.xml"],
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
"summary": "Email tracking system for all mails sent",
|
||||
"version": "13.0.1.0.6",
|
||||
"category": "Social Network",
|
||||
"website": "http://github.com/OCA/social",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"author": ("Tecnativa, " "Odoo Community Association (OCA)"),
|
||||
"license": "AGPL-3",
|
||||
"application": False,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
||||
<odoo>
|
||||
<record forcecreate="True" id="decimal_tracking_timestamp" model="decimal.precision">
|
||||
<record
|
||||
forcecreate="True"
|
||||
id="decimal_tracking_timestamp"
|
||||
model="decimal.precision"
|
||||
>
|
||||
<field name="name">MailTracking Timestamp</field>
|
||||
<field name="digits">6</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
|
||||
<t t-name="mail_tracking.failed_message_items">
|
||||
<div class="o_thread_date_separator o_border_dashed collapsed" data-toggle="collapse" data-target="#o_chatter_failed_message">
|
||||
<div
|
||||
class="o_thread_date_separator o_border_dashed collapsed"
|
||||
data-toggle="collapse"
|
||||
data-target="#o_chatter_failed_message"
|
||||
>
|
||||
<a role="button" class="o_thread_date btn">
|
||||
<i class="fa fa-fw fa-caret-down"/>
|
||||
<i class="fa fa-fw fa-caret-down" />
|
||||
Failed messages
|
||||
<small class="o_chatter_failed_message_summary ml8">
|
||||
<span class="badge rounded-circle badge-danger"><t t-esc="nbFailedMessages"/></span>
|
||||
<span class="badge rounded-circle badge-danger"><t
|
||||
t-esc="nbFailedMessages"
|
||||
/></span>
|
||||
</small>
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -16,40 +22,60 @@
|
|||
<div class="o_thread_message" style="margin-bottom: 10px">
|
||||
<div class="o_thread_message_sidebar">
|
||||
<div class="o_avatar_stack">
|
||||
<img t-attf-src="/web/image/res.partner/#{message.author[0]}/image_small" class="o_thread_message_avatar rounded-circle mb8" t-att-title="message.author[1]" t-att-alt="message.author[1]"/>
|
||||
<i t-att-class="'o_avatar_icon fa fa-exclamation bg-danger-full'"
|
||||
title="Failed"/>
|
||||
<img
|
||||
t-attf-src="/web/image/res.partner/#{message.author[0]}/image_small"
|
||||
class="o_thread_message_avatar rounded-circle mb8"
|
||||
t-att-title="message.author[1]"
|
||||
t-att-alt="message.author[1]"
|
||||
/>
|
||||
<i
|
||||
t-att-class="'o_avatar_icon fa fa-exclamation bg-danger-full'"
|
||||
title="Failed"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="o_thread_message_core">
|
||||
<div class="o_mail_info text-muted">
|
||||
<strong class="o_thread_author">
|
||||
<t t-esc="message.author[1]"/>
|
||||
<t t-esc="message.author[1]" />
|
||||
</strong>
|
||||
- <small class="o_mail_timestamp" t-att-title="message.date.format(date_format)"><t t-esc="message.hour"/></small>
|
||||
- <small
|
||||
class="o_mail_timestamp"
|
||||
t-att-title="message.date.format(date_format)"
|
||||
><t t-esc="message.hour" /></small>
|
||||
<span t-attf-class="o_thread_icons">
|
||||
<a href="#" class="btn btn-link btn-success o_thread_icon text-muted btn-sm o_failed_message_reviewed o_activity_link" t-att-data-message-id="message.id">
|
||||
<i class="fa fa-check"/> Set as Reviewed
|
||||
<a
|
||||
href="#"
|
||||
class="btn btn-link btn-success o_thread_icon text-muted btn-sm o_failed_message_reviewed o_activity_link"
|
||||
t-att-data-message-id="message.id"
|
||||
>
|
||||
<i class="fa fa-check" /> Set as Reviewed
|
||||
</a>
|
||||
<a href="#" class="btn btn-link btn-default o_thread_icon text-muted btn-sm o_failed_message_retry" t-att-data-message-id="message.id">
|
||||
<i class="fa fa-retweet"/> Retry
|
||||
<a
|
||||
href="#"
|
||||
class="btn btn-link btn-default o_thread_icon text-muted btn-sm o_failed_message_retry"
|
||||
t-att-data-message-id="message.id"
|
||||
>
|
||||
<i class="fa fa-retweet" /> Retry
|
||||
</a>
|
||||
</span>
|
||||
<br/>
|
||||
<br />
|
||||
<strong class="text-danger">Failed Recipients:</strong>
|
||||
<t t-foreach="message.failed_recipients" t-as="recipient">
|
||||
<t t-if="!recipient_first">
|
||||
-
|
||||
</t>
|
||||
<a class="o_mail_action_tracking_partner"
|
||||
t-att-data-partner="recipient[0]"
|
||||
t-attf-href="#model=res.partner&id=#{recipient[0]}">
|
||||
<t t-esc="recipient[1]"/>
|
||||
<a
|
||||
class="o_mail_action_tracking_partner"
|
||||
t-att-data-partner="recipient[0]"
|
||||
t-attf-href="#model=res.partner&id=#{recipient[0]}"
|
||||
>
|
||||
<t t-esc="recipient[1]" />
|
||||
</a>
|
||||
</t>
|
||||
</div>
|
||||
<div class="o_thread_message_note small">
|
||||
<t t-raw="message.body"/>
|
||||
<t t-raw="message.body" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2016 Tecnativa - Pedro M. Baeza
|
||||
Copyright 2016 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com>
|
||||
Copyright 2017 Tecnativa <vicent.cubellsn@tecnativa.com>
|
||||
|
|
@ -8,18 +8,44 @@
|
|||
<record id="view_partner_form_mailgun" model="ir.ui.view">
|
||||
<field name="name">Partner Mailgun button</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="mail_tracking.view_partner_form"/>
|
||||
<field name="inherit_id" ref="mail_tracking.view_partner_form" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="email_bounced" position="after">
|
||||
<label for="check_email_bounced" string="Mailgun"
|
||||
attrs="{'invisible': [('email', '=', False)]}"/>
|
||||
<div name="mailgun_buttons" attrs="{'invisible': [('email', '=', False)]}">
|
||||
<button name="check_email_bounced" type="object" string="Check Mailgun" class="oe_link"/>
|
||||
<button name="check_email_validity" type="object" string="Check email validity" class="oe_link"/>
|
||||
<button name="force_set_bounced" type="object" string="Set Bounced" class="oe_link"
|
||||
attrs="{'invisible': [('email_bounced', '=', True)]}"/>
|
||||
<button name="force_unset_bounced" type="object" string="Unset Bounced" class="oe_link"
|
||||
attrs="{'invisible': [('email_bounced', '=', False)]}"/>
|
||||
<label
|
||||
for="check_email_bounced"
|
||||
string="Mailgun"
|
||||
attrs="{'invisible': [('email', '=', False)]}"
|
||||
/>
|
||||
<div
|
||||
name="mailgun_buttons"
|
||||
attrs="{'invisible': [('email', '=', False)]}"
|
||||
>
|
||||
<button
|
||||
name="check_email_bounced"
|
||||
type="object"
|
||||
string="Check Mailgun"
|
||||
class="oe_link"
|
||||
/>
|
||||
<button
|
||||
name="check_email_validity"
|
||||
type="object"
|
||||
string="Check email validity"
|
||||
class="oe_link"
|
||||
/>
|
||||
<button
|
||||
name="force_set_bounced"
|
||||
type="object"
|
||||
string="Set Bounced"
|
||||
class="oe_link"
|
||||
attrs="{'invisible': [('email_bounced', '=', True)]}"
|
||||
/>
|
||||
<button
|
||||
name="force_unset_bounced"
|
||||
type="object"
|
||||
string="Unset Bounced"
|
||||
class="oe_link"
|
||||
attrs="{'invisible': [('email_bounced', '=', False)]}"
|
||||
/>
|
||||
</div>
|
||||
</field>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||
|
||||
<odoo noupdate="1">
|
||||
|
||||
<record id="event_draft" model="event.registration.state">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
|
||||
Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
Copyright 2015 Javier Iniesta <javieria@antiun.com>
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
<record model="ir.ui.view" id="mailing_list_view_form">
|
||||
<field name="name">mailing.list.form</field>
|
||||
<field name="model">mailing.list</field>
|
||||
<field name="inherit_id" ref="mass_mailing.mailing_list_view_form"/>
|
||||
<field name="inherit_id" ref="mass_mailing.mailing_list_view_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[hasclass('oe_title')]" position="after">
|
||||
<group>
|
||||
<group>
|
||||
<field name="partner_mandatory"/>
|
||||
<field name="partner_category"/>
|
||||
<field name="partner_mandatory" />
|
||||
<field name="partner_category" />
|
||||
</group>
|
||||
</group>
|
||||
</xpath>
|
||||
|
|
|
|||
Loading…
Reference in New Issue