Merge lp:~openerp-dev/openerp-web/trunk-routedeco-chs into lp:openerp-web
Proposed by
Antony Lesuisse (OpenERP)
Status: | Work in progress |
---|---|
Proposed branch: | lp:~openerp-dev/openerp-web/trunk-routedeco-chs |
Merge into: | lp:openerp-web |
Diff against target: |
291 lines (+108/-92) 2 files modified
addons/web/controllers/main.py (+3/-2) addons/web/http.py (+105/-90) |
To merge this branch: | bzr merge lp:~openerp-dev/openerp-web/trunk-routedeco-chs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP R&D Web Team | Pending | ||
Review via email: mp+136019@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 3494. By Christophe Simonis (OpenERP)
-
merge upstream
- 3493. By Christophe Simonis (OpenERP)
-
merge upstream
- 3492. By Christophe Simonis (OpenERP)
-
[FIX] do not reimport already imported modules
- 3491. By Christophe Simonis (OpenERP)
-
[FIX] correct logging of plain function
- 3490. By Christophe Simonis (OpenERP)
-
[FIX] allow multiple routes for a function
- 3489. By Christophe Simonis (OpenERP)
-
[FIX] host_matching
- 3488. By Christophe Simonis (OpenERP)
-
[FIX] deactivate host_matching for routes
- 3487. By Christophe Simonis (OpenERP)
-
[IMP] web: use werkzeug for routing