lp:~openerp-dev/openerp-web/trunk-routedeco-chs

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openerp-web

OpenERP R&D Web Team: Pending requested 2012-11-24

Diff: 291 lines (+108/-92)

2 files modified

addons/web/controllers/main.py (+3/-2)
addons/web/http.py (+105/-90)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3494. By Christophe Simonis (OpenERP) on 2013-05-02

merge upstream

3493. By Christophe Simonis (OpenERP) on 2013-04-15

merge upstream

3492. By Christophe Simonis (OpenERP) on 2012-11-24

[FIX] do not reimport already imported modules

3491. By Christophe Simonis (OpenERP) on 2012-11-24

[FIX] correct logging of plain function

3490. By Christophe Simonis (OpenERP) on 2012-11-24

[FIX] allow multiple routes for a function

3489. By Christophe Simonis (OpenERP) on 2012-11-24

[FIX] host_matching

3488. By Christophe Simonis (OpenERP) on 2012-11-24

[FIX] deactivate host_matching for routes

3487. By Christophe Simonis (OpenERP) on 2012-11-24

[IMP] web: use werkzeug for routing

3486. By van der Essen Frédéric (OpenERP) on 2012-11-23

[MERGE] new arrow for empty search message

3485. By Nicolas Vanhoren (OpenERP) on 2012-11-23

[FIX] minor modif of openerp logo