Commit Graph

30 Commits

Author SHA1 Message Date
Christophe Simonis 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
Denis Ledoux 14cd12e3ba [FIX] im: no need to see im.user to send him a message
bzr revid: dle@openerp.com-20140128203621-gjjxaf9tw33li52h
2014-01-28 21:36:21 +01:00
Denis Ledoux 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
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
Denis Ledoux 720526249b [FIX] im: search_users respects order of the search
bzr revid: dle@openerp.com-20140106210435-30oz2uo1yzah9mh3
2014-01-06 22:04:35 +01:00
Denis Ledoux 8d616676b6 [FIX] im: connected employee users appear firsts
bzr revid: dle@openerp.com-20140106160336-2azzid8n79mvbr3r
2014-01-06 17:03:36 +01:00
Denis Ledoux be148c7e1f [FIX] im: add fnct search to im_status to search connected users
search display connected users before discconnected users

bzr revid: dle@openerp.com-20140106154134-28ncdioyoca9102c
2014-01-06 16:41:34 +01:00
Antony Lesuisse 3d8b7984be import cleanups part1
bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh
2013-10-22 19:06:59 +02:00
Christophe Simonis fcd47fbd9f [IMP] im: tell orm to rename field user => user_id
bzr revid: chs@openerp.com-20130919144658-tf53x1zimnvbsk0u
2013-09-19 16:46:58 +02:00
niv-openerp 85e52d1f86 Now can disconnect from a group chat
bzr revid: nicolas.vanhoren@openerp.com-20130904131753-bdp93e8vwtg4za7n
2013-09-04 15:17:53 +02:00
niv-openerp d8bbbdf7c5 wip
bzr revid: nicolas.vanhoren@openerp.com-20130902172923-n0ofkb51orxfrq75
2013-09-02 19:29:23 +02:00
niv-openerp 1a82946928 Now correctly send technical message.
bzr revid: nicolas.vanhoren@openerp.com-20130902170252-nmp5kw1023jx65ij
2013-09-02 19:02:52 +02:00
niv-openerp ee19c62e0a Make group chat really work
bzr revid: nicolas.vanhoren@openerp.com-20130902160811-fkdleeurq1g9msi2
2013-09-02 18:08:11 +02:00
niv-openerp b4b74f9a20 Bases of the group chat work
bzr revid: nicolas.vanhoren@openerp.com-20130902151404-gyy9ydjqu5xucpf5
2013-09-02 17:14:04 +02:00
niv-openerp 1f9d21552b Re-enabled history of live chat
bzr revid: nicolas.vanhoren@openerp.com-20130902135601-4hyeq0y1l1icgpno
2013-09-02 15:56:01 +02:00
niv-openerp 2689878df5 Put logged users on top in the search panel
bzr revid: nicolas.vanhoren@openerp.com-20130902125856-6ft2711c0sr29j83
2013-09-02 14:58:56 +02:00
niv-openerp 9071d01a28 wip
bzr revid: nicolas.vanhoren@openerp.com-20130902122311-gopkikbta9dg7cne
2013-09-02 14:23:11 +02:00
niv-openerp 9a8fe95a5c Get back a working version
bzr revid: nicolas.vanhoren@openerp.com-20130902095151-0etexao0jbdiymry
2013-09-02 11:51:51 +02:00
niv-openerp 4dc6ac8da4 wip
bzr revid: nicolas.vanhoren@openerp.com-20130902093104-pmeo49m2u5mud8bb
2013-09-02 11:31:04 +02:00
niv-openerp 58e064d078 Added sessions server-side
bzr revid: nicolas.vanhoren@openerp.com-20130830144824-xabc1du6qss9wjv2
2013-08-30 16:48:24 +02:00
niv-openerp 5e8315730b Solved a few bugs
bzr revid: nicolas.vanhoren@openerp.com-20130826125254-smlkkh5m3n36cklw
2013-08-26 14:52:54 +02:00
niv-openerp 8ee25f9856 Refactored to avoid user duplication problem
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
niv-openerp 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
niv-openerp 980952c416 Ported most of the old im.js to im_common.js
bzr revid: nicolas.vanhoren@openerp.com-20130820141538-xsdm64uinhbf8v5g
2013-08-20 16:15:38 +02:00
niv-openerp 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
niv-openerp 8cc30e00e6 Rewrite the way the im login authenticate
bzr revid: nicolas.vanhoren@openerp.com-20130621132402-peww92wss5vmjcp9
2013-06-21 15:24:02 +02:00
niv-openerp 355d864526 im: refactored due to changes in web framework
bzr revid: nicolas.vanhoren@openerp.com-20130621130359-6267v1w0hney9dtt
2013-06-21 15:03:59 +02:00
niv-openerp 56ee39a8c2 [FIX] im: long polling doesn't work correctly in some cases depending how the openerp server is launched
bzr revid: nicolas.vanhoren@openerp.com-20130530092607-u2sxvbhz6jnn9o24
2013-05-30 11:26:07 +02:00
niv-openerp b4f7cbe1ab Cosmetic change
bzr revid: nicolas.vanhoren@openerp.com-20130404083427-vxlhyvafqh530qc1
2013-04-04 10:34:27 +02:00
niv-openerp 8ae0252436 Forgot a rename
bzr revid: nicolas.vanhoren@openerp.com-20130315112337-1d5d29wegmhml5zc
2013-03-15 12:23:37 +01:00