projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1516b6f d51cf60)
[MRG] merge with lp:openerp-web
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 22 May 2013 06:30:18 +0000 (12:00 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 22 May 2013 06:30:18 +0000 (12:00 +0530)
commit83740f70f06821a44e52f5f7382a56469ae585c4
treed5e9024618438b89be03857a62255bf091961f8atree | snapshot
parent1516b6f410d424792cd70c94b461ae63ef38b25dcommit | diff
parentd51cf606167f870bb6be260ef494fc96dea05b09commit | diff
[MRG] merge with lp:openerp-web

bzr revid: tpa@tinyerp.com-20130522063018-q6oevmlcnrfl7i79
19 files changed:
addons/web/__openerp__.py diff1 | diff2 | blob | history
addons/web/controllers/main.py diff1 | diff2 | blob | history
addons/web/static/src/css/base.css diff1 | diff2 | blob | history
addons/web/static/src/css/base.sass diff1 | diff2 | blob | history
addons/web/static/src/fixbind.js | | blob
addons/web/static/src/js/chrome.js diff1 | diff2 | blob | history
addons/web/static/src/js/data.js diff1 | diff2 | blob | history
addons/web/static/src/js/formats.js diff1 | diff2 | blob | history
addons/web/static/src/js/search.js diff1 | diff2 | blob | history
addons/web/static/src/js/testing.js diff1 | diff2 | blob | history
addons/web/static/src/js/view_list.js diff1 | diff2 | blob | history
addons/web/static/src/js/views.js diff1 | diff2 | blob | history
addons/web/static/test/data.js | | blob
addons/web/static/test/search.js diff1 | diff2 | blob | history
addons/web_calendar/static/src/js/calendar.js diff1 | diff2 | blob | history
addons/web_diagram/controllers/main.py diff1 | diff2 | blob | history
addons/web_kanban/static/src/css/kanban.css diff1 | diff2 | blob | history
addons/web_kanban/static/src/css/kanban.sass diff1 | diff2 | blob | history
addons/web_view_editor/static/src/js/view_editor.js diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.