From c0e139bd4bdbd5e5feb9b3595a67655302be840c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 7 Nov 2012 09:59:26 +0100 Subject: [IMP] mail: displayed messages now goe through html_email_clean to clean their content; added a css because we now have lots of

in chatter messages, and default margin is quite big (to be improved maybe); updated demo data. bzr revid: tde@openerp.com-20121107085926-9g609zgmkg4kieqc --- addons/mail/data/mail_group_data.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'addons/mail/data/mail_group_data.xml') diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 11d0ee7d04b..fe24f0b8661 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -1,6 +1,7 @@ - + + Sales @@ -18,11 +19,9 @@ notification Welcome to OpenERP! - Your homepage is a summary of messages you received and key information about documents you follow. - -The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users. - -To setup your preferences (name, email signature, avatar), click on the top right corner. + Your homepage is a summary of messages you received and key information about documents you follow.
+The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users.
+To setup your preferences (name, email signature, avatar), click on the top right corner.

]]> -- cgit v1.2.3 From c983fba3c3ad75f367d3b06bf131ff51e76f3b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 7 Nov 2012 11:02:06 +0100 Subject: [FIX] mail: demo data back as noupdate. bzr revid: tde@openerp.com-20121107100206-bi39ap6821woug8x --- addons/mail/data/mail_group_data.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/mail/data/mail_group_data.xml') diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index fe24f0b8661..6f039d64c0d 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -1,7 +1,6 @@ - - + Sales -- cgit v1.2.3 From 5854861cf51543f18403745ea83cf7eca545bcab Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 13 Nov 2012 00:04:18 +0100 Subject: [IMP] mail group view bzr revid: fp@openerp.com-20121112230418-nhvk886m3rzbglmg --- addons/mail/data/mail_group_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/data/mail_group_data.xml') diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 11d0ee7d04b..2daa69b283b 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -9,7 +9,7 @@ Whole Company - Discussion about best sales practices and deals. + General announces for all employees. -- cgit v1.2.3 From 64277d04c39767f6633c9406a393302c1924d9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 14 Nov 2012 12:55:04 +0100 Subject: [IMP] Addons: messages when installing key apps is not of comment subtype, meaning they are effectively pushed. bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed --- addons/mail/data/mail_group_data.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/mail/data/mail_group_data.xml') diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 2c983d67758..aae30226bf2 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -17,6 +17,7 @@ mail.group notification + Welcome to OpenERP! Your homepage is a summary of messages you received and key information about documents you follow.
The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users.
-- cgit v1.2.3 From 2cfef36846745dbd6b03288f9e223ce9977195ca Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 15 Nov 2012 11:07:40 +0100 Subject: [MERGE] improved welcome messages and mail css bzr revid: fp@tinyerp.com-20121115100740-3pbot8zfu64s4ods --- addons/mail/data/mail_group_data.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/mail/data/mail_group_data.xml') diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index aae30226bf2..6d3e5395eda 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -19,8 +19,8 @@ notification Welcome to OpenERP! - Your homepage is a summary of messages you received and key information about documents you follow.
-The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users.
+ Your homepage is a summary of messages you received and key information about documents you follow.

+The top menu bar contains all applications you installed. You can use this Settings menu to install more applications, activate others features or give access to new users.

To setup your preferences (name, email signature, avatar), click on the top right corner.

]]>
-- cgit v1.2.3 From c6b5ca0a078c83f211dc469f3ca764400f3586e6 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 15 Nov 2012 11:39:47 +0100 Subject: [FIX] typo in a message bzr revid: fp@tinyerp.com-20121115103947-zre3ja8ghnojesd1 --- addons/mail/data/mail_group_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/data/mail_group_data.xml') diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 6d3e5395eda..64d989f9e9d 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -20,7 +20,7 @@ Welcome to OpenERP! Your homepage is a summary of messages you received and key information about documents you follow.

-The top menu bar contains all applications you installed. You can use this Settings menu to install more applications, activate others features or give access to new users.

+The top menu bar contains all applications you installed. You can use the Settings menu to install more applications, activate others features or give access to new users.

To setup your preferences (name, email signature, avatar), click on the top right corner.

]]>
-- cgit v1.2.3