[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_...
authorChristophe Simonis <chs@openerp.com>
Tue, 18 Mar 2014 11:27:43 +0000 (12:27 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 18 Mar 2014 11:27:43 +0000 (12:27 +0100)
commitacb010a9852755668bbe3f2419ae5038683f4a93
tree2e3c17a35176648a313d6483a3e415eda4f647df
parentc2ba11e72e1e0ac5d1d93c476b510454d22f362c
parenta8d14c47df21ae4259fe13f9d96096561a0bf46b
[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0

bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
13 files changed:
addons/web/controllers/main.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/chrome.js
addons/web/static/src/js/data.js
addons/web/static/src/js/data_export.js
addons/web/static/src/js/formats.js
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js
addons/web/tests/test_dataset.py
addons/web_kanban/static/src/js/kanban.js