lp:~openerp-dev/openerp-web/trunk-website-al

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openerp-web at revision 3861

OpenERP R&D Web Team: Pending requested 2013-07-24

Diff: 3859 lines (+3612/-62)

15 files modified

addons/web/__openerp__.py (+3/-0)
addons/web/http.py (+5/-5)
addons/web/static/lib/es5-shim/README.md (+155/-0)
addons/web/static/lib/es5-shim/es5-shim.js (+1320/-0)
addons/web/static/lib/es5-shim/es5-shim.map (+1/-0)
addons/web/static/lib/es5-shim/es5-shim.min.js (+4/-0)
addons/web/static/lib/es5-shim/package.json (+34/-0)
addons/web/static/lib/fontawesome/css/font-awesome.css (+1479/-0)
addons/web/static/lib/fontawesome/font/fontawesome-webfont.svg (+399/-0)
addons/web/static/lib/jquery.hotkeys/README.md (+45/-0)
addons/web/static/lib/jquery.hotkeys/jquery.hotkeys.js (+99/-0)
addons/web/static/lib/qweb/qweb2.js (+66/-30)
addons/web/static/src/js/core.js (+0/-25)
addons/web/tests/qunitsuite/suite.py (+1/-1)
addons/web_calendar/static/src/js/calendar.js (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3834. By Fabien Meghazi (OpenERP) on 2014-02-03

[MERGE] saas-3

3833. By Dimitri del Marmol on 2014-01-31

Merge trunk

3832. By Antony Lesuisse (OpenERP) on 2014-01-31

web disable jsonrpc test

3831. By Christophe Simonis (OpenERP) on 2014-01-30

[IMP] web: alternative routes for company logo

3830. By Denis Ledoux (OpenERP) on 2014-01-30

[FIX] web: use werkzeug instead of urllib, as werkzeug handle utf-8 while urllib doesnt

3829. By Fabien Meghazi (OpenERP) on 2014-01-30

[FIX] ensure db param is legit in order to avoid xss

3828. By Fabien Meghazi (OpenERP) on 2014-01-30

[MOV] Move ensure_db() helper from

Since we removed auth="admin" in favor of auth="none" with explicit superuser id usage,
the disable_db clause in ir_http#...auth_none() has only sense for /web and /web/login routes.
The web module is an exception because it's routes are registered for the nodb dispatching.
This is why the ensure_db() helper is moved to web client and will take care of the
web's auth="none" routes that needs a db to work with

3827. By Fabien Meghazi (OpenERP) on 2014-01-29

[REM] Remove single auth="admin" left

3826. By Fabien Meghazi (OpenERP) on 2014-01-28

[IMP] Use ensure_db() for /web and /web/login. Logout controller does not clear the db anymore

3825. By Xavier (Open ERP) on 2014-01-28

[FIX] update CKEditor to 4.3.2, fixes problem of double-escaping of non-ascii characters in widgets