c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
731019154a
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
...
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
f13dd8cee7
[FIX][ADD] im, im_livechat: fix security rules and add history when opening a conversation
...
bzr revid: dle@openerp.com-20140128162649-aptjndl85ocmem8a
2014-01-28 17:26:49 +01:00
5e12e47c87
[REF] Replace login as anonymous in im_livechat with auth_method_public
...
bzr revid: jke@openerp.com-20140128143224-139yby4apcrvjf54
2014-01-28 15:32:24 +01:00
2ef9fbe42f
[FIX] livechat dataweb-style rename
...
bzr revid: al@openerp.com-20140126212018-q8f63sy21t1ph8dn
2014-01-26 22:20:18 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
4ab77759cc
[MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy
...
bzr revid: chs@openerp.com-20131204130023-lgravuoxwlt39pek
2013-12-04 14:00:23 +01:00
dea3fdeeed
[FIX] im_livechat: many2one channel_id of im_session to the right model.
...
In im_session model, field channel_id was a many2one to im_user, or, obviously, this should be a many2one to im_livechat.channel
Well, obviously, this is a copy/paste error (or distraction, your choice!). This fix should normally not be pushed on a stable branch (like the current one, saas-2), but considering the severity of the problem, and the few changes in database (alter foreign key only), this is acceptable. Why such a big mistake has not been seen earlier ? Do you even test or read back what you write ?
bzr revid: dle@openerp.com-20131204122727-q0ch5j2v8rrli41e
2013-12-04 13:27:27 +01:00
5bb4fa2b43
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
737586aa4e
typo
...
bzr revid: al@openerp.com-20131027164023-ky1nthy56fmqr4f2
2013-10-27 17:40:23 +01:00
3d8b7984be
import cleanups part1
...
bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh
2013-10-22 19:06:59 +02:00
607de396ba
[MERGE] Sync with trunk, until revision 8927
...
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
d8bbbdf7c5
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20130902172923-n0ofkb51orxfrq75
2013-09-02 19:29:23 +02:00
9071d01a28
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20130902122311-gopkikbta9dg7cne
2013-09-02 14:23:11 +02:00
4dc6ac8da4
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20130902093104-pmeo49m2u5mud8bb
2013-09-02 11:31:04 +02:00
ed35895126
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130828163937-japdo58t20hhqfoz
2013-08-28 18:39:37 +02:00
8ee25f9856
Refactored to avoid user duplication problem
...
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
8f33049f2f
Changed user field to user_id and added unique constraint
...
bzr revid: nicolas.vanhoren@openerp.com-20130826084554-221ts80q8c5jvqv1
2013-08-26 10:45:54 +02:00
75ff22286f
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130726143134-4vmzxqcb2d3fnwwx
2013-07-26 16:31:34 +02:00
6a9bbba17e
[IMP] remove portal_anonymous, create group_public in server and public user in website
...
bzr revid: chm@openerp.com-20130726090445-4mmd1xlx5uwd6vmx
2013-07-26 11:04:45 +02:00
12f58092f2
[IMP] some refactoring due to changes in the web client
...
bzr revid: nicolas.vanhoren@openerp.com-20130711160702-qs6pfyqsxmzd7cgy
2013-07-11 18:07:02 +02:00
dcf20f9871
Refactored livechat
...
bzr revid: nicolas.vanhoren@openerp.com-20130621133310-a68iiqy9wpu40iws
2013-06-21 15:33:10 +02:00
b4f7cbe1ab
Cosmetic change
...
bzr revid: nicolas.vanhoren@openerp.com-20130404083427-vxlhyvafqh530qc1
2013-04-04 10:34:27 +02:00
296b9fbbb4
Renammed modules
...
bzr revid: nicolas.vanhoren@openerp.com-20130315112153-ftm3i021erfnqp01
2013-03-15 12:21:53 +01:00
Christophe Simonis
Denis Ledoux
jke-openerp
Antony Lesuisse
Thibault Delavallée
niv-openerp
Christophe Matthieu