lp:~openerp-dev/openobject-addons/trunk-im-al

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2014-03-30

Diff: 19335 lines (+3893/-14775)

46 files modified

im/Gruntfile.js (+0/-20)
im/__init__.py (+1/-0)
im/__openerp__.py (+12/-0)
im/im.py (+186/-0)
im/package.json (+0/-6)
im/static/src/js/im.js (+0/-175)
im/static/src/xml/im_common.xml (+0/-42)
im/views/im.xml (+12/-0)
im/watcher.py (+0/-85)
im_chat/__init__.py (+1/-2)
im_chat/__openerp__.py (+5/-6)
im_chat/im_chat.py (+318/-343)
im_chat/security/im_security.xml (+21/-10)
im_chat/security/ir.model.access.csv (+4/-3)
im_chat/static/src/css/im_common.css (+42/-11)
im_chat/static/src/js/im_chat.js (+439/-444)
im_chat/static/src/xml/im_chat.xml (+89/-26)
im_chat/views/im_chat.xml (+4/-5)
im_livechat/__openerp__.py (+4/-2)
im_livechat/im_livechat.py (+61/-62)
im_livechat/include.html (+0/-2)
im_livechat/loader.js (+0/-47)
im_livechat/security/im_livechat_security.xml (+1/-1)
im_livechat/security/ir.model.access.csv (+0/-2)
im_livechat/static/ext/.bowerrc (+0/-3)
im_livechat/static/ext/Gruntfile.js (+0/-20)
im_livechat/static/ext/Makefile (+0/-3)
im_livechat/static/ext/bower.json (+0/-18)
im_livechat/static/ext/package.json (+0/-6)
im_livechat/static/ext/static/lib/jquery/jquery.js (+0/-9472)
im_livechat/static/ext/static/lib/qweb/qweb2.js (+0/-736)
im_livechat/static/ext/static/lib/requirejs/require.js (+0/-2053)
im_livechat/static/ext/static/lib/underscore/underscore.js (+0/-999)
im_livechat/static/ext/test.html (+0/-10)
im_livechat/static/src/js/im_livechat.js (+71/-88)
im_livechat/views/im_livechat.xml (+131/-0)
im_livechat/views/im_livechat_view.xml (+12/-12)
im_livechat/web_page.html (+0/-61)
im_screenshare/__init__.py (+1/-0)
im_screenshare/__openerp__.py (+25/-0)
im_screenshare/im_screenshare.py (+60/-0)
im_screenshare/im_screenshare.xml (+127/-0)
im_screenshare/player.html (+121/-0)
im_screenshare/static/lib/mutation-summary/mutation-summary.js (+1665/-0)
im_screenshare/static/lib/mutation-summary/tree-mirror.js (+312/-0)
im_screenshare/static/src/js/im_screenshare.js (+168/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9276. By Antony Lesuisse (OpenERP) on 2014-05-11

[MERGE] manual merge of trunk-im-jem

9275. By Antony Lesuisse (OpenERP) on 2014-05-05

[FIX] misc fixes

9274. By Antony Lesuisse (OpenERP) on 2014-05-05

im_chat move update_state on session

9273. By Antony Lesuisse (OpenERP) on 2014-05-04

[IMP] clean im.bus, im_chat python side, fix partially js

9272. By Antony Lesuisse (OpenERP) on 2014-05-03

[MERGE] trunk

9271. By Antony Lesuisse (OpenERP) on 2014-04-26

[MERGE] jem, manual merge to minimize diff size and experimental history

9270. By Antony Lesuisse (OpenERP) on 2014-04-25

[MERGE] trunk

9269. By Antony Lesuisse (OpenERP) on 2014-04-06

im bus add missed notifications support

9268. By Antony Lesuisse (OpenERP) on 2014-04-02

[MERGE] jem

9267. By Antony Lesuisse (OpenERP) on 2014-03-31

add im_screesharing based on old web_record branch, not yet working