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
df38615ea3
[REF] Remove button from im_livechat in tree view for History. That a read only view, so nothing to create
...
bzr revid: jke@openerp.com-20140128162304-ta4w7hy3fw1z56ey
2014-01-28 17:23:04 +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
3ecb289c1e
[FIX] addons: fixed some references to portal.group_portal -> base.group_portal
...
bzr revid: tde@openerp.com-20131008132616-6rhc4xuzfgtyvweg
2013-10-08 15:26:16 +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
13a4d99568
Fixed small bug in live support
...
bzr revid: nicolas.vanhoren@openerp.com-20130902161517-2ljcr13d96sz0q9r
2013-09-02 18:15:17 +02:00
1f9d21552b
Re-enabled history of live chat
...
bzr revid: nicolas.vanhoren@openerp.com-20130902135601-4hyeq0y1l1icgpno
2013-09-02 15:56:01 +02:00
f958499b9e
make live support work again
...
bzr revid: nicolas.vanhoren@openerp.com-20130902122719-ezxkjlkc7d2812jr
2013-09-02 14:27:19 +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
1d5f220d12
Solved bottom offset problem
...
bzr revid: nicolas.vanhoren@openerp.com-20130820150607-btn650h12nygofcm
2013-08-20 17:06:07 +02:00
d756dc5977
Removed to_url
...
bzr revid: nicolas.vanhoren@openerp.com-20130820144843-yeny7kpv1qcqijl9
2013-08-20 16:48:43 +02:00
124b93b0c1
Fixed a lot of stuff to make it work again in live support
...
bzr revid: nicolas.vanhoren@openerp.com-20130820144147-gnc26ul3ql86qfzs
2013-08-20 16:41:47 +02:00
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
d60c2a5f7e
Some cleaning
...
bzr revid: nicolas.vanhoren@openerp.com-20130820121522-en3bft0wotfnsozm
2013-08-20 14:15:22 +02:00
c2366d7181
Put ChatButton in livechat
...
bzr revid: nicolas.vanhoren@openerp.com-20130819142139-mvh25k95k1wbjtzv
2013-08-19 16:21:39 +02:00
910ae6cba9
Created chat common javascript module/css/template file
...
bzr revid: nicolas.vanhoren@openerp.com-20130819140908-iai1e58wh7ofb7tp
2013-08-19 16:09:08 +02:00
938615e3e1
Added some doc
...
bzr revid: nicolas.vanhoren@openerp.com-20130819123332-cey9dmwrl39t2b1k
2013-08-19 14:33:32 +02:00
2f0e54db9d
Now has a good amd wrapper for qweb
...
bzr revid: nicolas.vanhoren@openerp.com-20130819122459-45alsxp7m8zphc6v
2013-08-19 14:24:59 +02:00
6badbe9253
Now the live chat seems to work correctly again
...
bzr revid: nicolas.vanhoren@openerp.com-20130819121415-ksb84flj8t0q6x1e
2013-08-19 14:14:15 +02:00
f47e78b757
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20130819093338-9g3ar3routxezzyk
2013-08-19 11:33:38 +02:00
580287348d
Converted templates + wip
...
bzr revid: nicolas.vanhoren@openerp.com-20130819091741-focrd0tpwjv2vg8s
2013-08-19 11:17:41 +02:00
285b8ceae7
First version that does not crash on loading
...
bzr revid: nicolas.vanhoren@openerp.com-20130814163114-7rg9hfl274o166ph
2013-08-14 18:31:14 +02:00
a7d8dca61d
Begin re-writing of javascript part
...
bzr revid: nicolas.vanhoren@openerp.com-20130814143115-9goib9f0evrtyal8
2013-08-14 16:31:15 +02:00
19fa30082d
Put requirejs in libs
...
bzr revid: nicolas.vanhoren@openerp.com-20130813135404-ymjc5ph7v9f1xylr
2013-08-13 15:54:04 +02:00
7795418aab
Re-packaged achtung
...
bzr revid: nicolas.vanhoren@openerp.com-20130812152102-p9v8cpck3uezb45q
2013-08-12 17:21:02 +02:00
3fa7930823
Re-created a requirejs config that works
...
bzr revid: nicolas.vanhoren@openerp.com-20130812151036-jr2288c99zb1s8sm
2013-08-12 17:10:36 +02:00
ea13adf323
Used bower for dependencies
...
bzr revid: nicolas.vanhoren@openerp.com-20130812092501-c4auij2gb90drid1
2013-08-12 11:25:01 +02:00
fe6e0e39e8
[FIX] depends with portal inside of website
...
bzr revid: chm@openerp.com-20130726144436-2i8q9348hiku4wch
2013-07-26 16:44:36 +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
fc70550ca2
[IMP] move html module description and icon
...
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
dcf20f9871
Refactored livechat
...
bzr revid: nicolas.vanhoren@openerp.com-20130621133310-a68iiqy9wpu40iws
2013-06-21 15:33:10 +02:00
3a3841aabe
[FIX] im: do not send empty messages
...
bzr revid: nicolas.vanhoren@openerp.com-20130531111317-h17qwsevk06bhf84
2013-05-31 13:13:17 +02:00
9b69d0a336
[FIX] im, im_livechat: not all browsers correctly support audio, desactivating audio when not supported
...
bzr revid: nicolas.vanhoren@openerp.com-20130530115948-ymhw6s4fyo9h219i
2013-05-30 13:59:48 +02:00
0ee102aacd
[FIX] im: Hé José, fais pèter l'son!
...
bzr revid: nicolas.vanhoren@openerp.com-20130530101832-jmrzzzx70m6haj6c
2013-05-30 12:18:32 +02:00
Christophe Simonis
Denis Ledoux
jke-openerp
Antony Lesuisse
Thibault Delavallée
niv-openerp
Christophe Matthieu