lp:~openerp-dev/openerp-web/trunk-ui-to-boostrap-modal

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openerp-web

OpenERP R&D Web Team: Pending requested 2013-12-23

Diff: 2038 lines (+474/-567)

10 files modified

addons/web/static/src/css/base.css (+75/-152)
addons/web/static/src/css/base.sass (+68/-114)
addons/web/static/src/js/chrome.js (+90/-68)
addons/web/static/src/js/data_export.js (+1/-2)
addons/web/static/src/js/view_form.js (+18/-22)
addons/web/static/src/js/views.js (+5/-5)
addons/web/static/src/xml/base.xml (+63/-49)
addons/web_calendar/static/src/js/web_calendar.js (+148/-148)
addons/web_diagram/static/src/js/diagram.js (+1/-2)
addons/web_view_editor/static/src/js/view_editor.js (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3933. By Kunal Chavda on 2014-02-03

[MERGE]with latest and resolved conflicts.

3932. By Ishwar Malvi(OpenERP) on 2014-01-07

[MERGE]with trunk.

3931. By Ishwar Malvi(OpenERP) on 2014-01-03

[MERGE]with trunk.

3930. By Ishwar Malvi(OpenERP) on 2013-12-30

[MERGE]with trunk.

3929. By Ishwar Malvi(OpenERP) on 2013-12-30

[IMP]improved code for modal resizable.

3928. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code to destroy modal.

3927. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code for modal destoy on esc key.

3926. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code.

3925. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code for configuration error in sale stock.

3924. By Ishwar Malvi(OpenERP) on 2013-12-26

[IMP]improved code due to linked in integration modal advanced search.