Commit Graph

70 Commits

Author SHA1 Message Date
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Fabien Meghazi 98302fca76 [REM] Removed globs from manifest in order to automate bundlification
bzr revid: fme@openerp.com-20140424122621-1smlpr1r7izuw369
2014-04-24 14:26:21 +02:00
Christophe Simonis d5106a4d34 [MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
2014-02-20 16:45:17 +01:00
Denis Ledoux 1d35e6fdef [FIX] im: security rule preventing to write on sessions
bzr revid: dle@openerp.com-20140218130109-j69jst2fz2kvni26
2014-02-18 14:01:09 +01:00
Christophe Simonis c202dc1c52 merge upstream
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
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 f9af9fae12 [FIX] im: wrong access rule (user_ids in an array of ids, not an array of tuple (id, name)) + useless arg passed to ensure_users
bzr revid: dle@openerp.com-20140128195718-47861aq02r3mqdf8
2014-01-28 20:57:18 +01:00
Denis Ledoux b090a05a36 [FIX] im: history in order
bzr revid: dle@openerp.com-20140128190235-rauds4lp3h8jqhqr
2014-01-28 20:02:35 +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
jke-openerp ec88620d31 [REF] Adjust positionning from icon IM (temp while fontawsome replace it)
bzr revid: jke@openerp.com-20140128003723-0f8651a5j4px8sy0
2014-01-28 01:37:23 +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 b62aed69eb [REVERT]rev 9073 dle@openerp.com-20140107105324-xaa21r8fnl0ncg66, revert change in im_common js, it should not have been commited at all.
bzr revid: dle@openerp.com-20140107143908-ci69xk0235m2pxzt
2014-01-07 15:39:08 +01:00
Denis Ledoux e5e397b01b [FIX] crm_partner_assign: on forward, set section_id if user_id has default section id
bzr revid: dle@openerp.com-20140107105324-xaa21r8fnl0ncg66
2014-01-07 11:53:24 +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 387dd67791 [FIX] im: no notification sound on own message
bzr revid: dle@openerp.com-20140106200737-mpfx3b81ku1zlkig
2014-01-06 21:07:37 +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
Denis Ledoux 57c6fbe327 [FIX] im: notification sound change
bzr revid: dle@openerp.com-20140106145835-32qb42tznqbhxkij
2014-01-06 15:58:35 +01:00
Denis Ledoux 7df936a4ce [FIX] im: open url in another tab/window
bzr revid: dle@openerp.com-20140106141846-ezkxpgprn15nkp8a
2014-01-06 15:18:46 +01:00
Denis Ledoux 68de728214 [FIX] im: notifications fixes & sound change
notification sound on first message of conversation
no notification when message received is from the current uid
notifcation sound changed. Louder & clearer.

bzr revid: dle@openerp.com-20140106135056-4179b6u5lcou2w52
2014-01-06 14:50:56 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
ima-openerp 1098f7021e [IMP]improved css for sales team kanban, sale order payment_acquirers and attach file button.
bzr revid: ima@tinyerp.com-20131114120529-5ltoe9aoglsx92vv
2013-11-14 17:35:29 +05:30
Paramjit Singh Sahota 6f71304ad6 [IMP] Improved code according to the changes of bootstrap3 in web.
bzr revid: psa@tinyerp.com-20131113105053-80qelj2buiehd6fl
2013-11-13 16:20:53 +05:30
Christophe Simonis c58f13c8e9 [FIX] im: do not search users before start polling. This avoid a race condition for im.user creation
bzr revid: chs@openerp.com-20131022171010-ilfvqced6q8qta3h
2013-10-22 19:10:10 +02: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 298fbff2bb [FIX] security problem in im
bzr revid: nicolas.vanhoren@openerp.com-20130911163452-jumg8wahlzof4a6l
2013-09-11 18:34:52 +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 acea8a695b Does not open window all the time when the session is modified
bzr revid: nicolas.vanhoren@openerp.com-20130904095746-yyqq7wh1h38x2ndx
2013-09-04 11:57:46 +02:00
niv-openerp 0c03661b56 Added url detection
bzr revid: nicolas.vanhoren@openerp.com-20130903135940-3miafvmwtiiuc769
2013-09-03 15:59:40 +02:00
niv-openerp 6c6169da1b Added critical feature
bzr revid: nicolas.vanhoren@openerp.com-20130902173659-r5tl8ds8djcjdrb2
2013-09-02 19:36:59 +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 7bce27c528 Now uses im.user's images
bzr revid: nicolas.vanhoren@openerp.com-20130826085212-od9oxv6h4jtkd6nf
2013-08-26 10:52:12 +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 89b3edad09 Solved style problems identified by jshint
bzr revid: nicolas.vanhoren@openerp.com-20130820151241-1oi29vxm8iq34v8x
2013-08-20 17:12:41 +02:00
niv-openerp 1d5f220d12 Solved bottom offset problem
bzr revid: nicolas.vanhoren@openerp.com-20130820150607-btn650h12nygofcm
2013-08-20 17:06:07 +02:00
niv-openerp d756dc5977 Removed to_url
bzr revid: nicolas.vanhoren@openerp.com-20130820144843-yeny7kpv1qcqijl9
2013-08-20 16:48:43 +02:00