Twinkle Christian(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-social-network-jam-test-tch into
lp:~openerp-dev/openobject-addons/trunk-social-network-jam.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-network-jam-test-tch/+merge/112967
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-network-jam-test-tch/+merge/112967
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-social-network-jam.
=== modified file 'mail/__openerp__.py'
--- mail/__openerp__.py 2012-06-28 10:32:03 +0000
+++ mail/__openerp__.py 2012-07-02 05:20:27 +0000
@@ -20,29 +20,41 @@
##############################################################################
{
+<<<<<<< TREE
'name': 'Social Network',
+=======
+ 'name': 'Social Networking',
+>>>>>>> MERGE-SOURCE
'version': '1.0',
+<<<<<<< TREE
'category': 'Social Neworking',
"sequence": 2,
+=======
+ 'category': 'Dependency',
+>>>>>>> MERGE-SOURCE
'description': """
-A generic email subsystem with message storage and queuing
-==========================================================
+A bussiness oriented Social Networking stands with message storage,
+queuing and feeds.
+===================================================================
-This email subsystem is not intended to be used as as standalone
-application, but to provide a unified email abstraction that all
-other applications can use.
+This Social Networking service that enables its users to send and read
+text-based posts via feeds,and its provide a unified social network
+abstraction that all other applications can use,also it used as a email
+subsystem.
The main features are:
-
- * Relies on the global Outgoing Mail Servers configured in the
- Administration menu for delivering outgoing mail
+
+ * Trouble free application.
+ * Hassle free user communication via feeds menu.
+ * And also it relies on the global Outgoing Mail Servers configured
+ in the , Administration menu for delivering outgoing mail.
+ * Includes queuing mechanism with automated configurable
+ scheduler-based processing
* Provides an API for sending messages and archiving them,
- grouped by conversation
+ grouped by conversation,
* Any OpenERP document can act as a conversation topic, provided
it includes the necessary support for handling incoming emails
(see the ``mail.thread`` class for more details).
- * Includes queuing mechanism with automated configurable
- scheduler-based processing
* Includes a generic email composition assistant, that can turn
into a mass-mailing assistant, and is capable of interpreting
simple *placeholder expressions* that will be replaced with
@@ -96,5 +108,6 @@
'demo': [
'mail_demo.xml',
],
+ 'application':True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
