lp:~openerp-dev/openerp-web/trunk-mail-ie-chm

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-12-14

Diff: 1326 lines (+378/-341)

2 files modified

addons/web/static/lib/cleditor/jquery.cleditor.js (+374/-336)
addons/web/static/src/js/view_form.js (+4/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3617. By Christophe Matthieu (OpenERP) on 2012-12-21

[MERGE] from trunk

3616. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] cleditor: remove spaces

3615. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] web form: fieldtexthtml

3614. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] cleditor: rewrite braces, spaces, ponctuation

3613. By Christophe Matthieu (OpenERP) on 2012-12-17

[FIX] web cleditor: bind and trigger event change inside cleditor

3612. By Christophe Matthieu (OpenERP) on 2012-12-14

[IMP] web form: change for cleditor field html

3611. By Christophe Matthieu (OpenERP) on 2012-12-14

[IMP] view_form: add console in cleditor for ie debugging

3610. By Launchpad Translations on behalf of openerp on 2012-12-14

Launchpad automatic translations update.

3609. By Nicolas Vanhoren (OpenERP) on 2012-12-13

[FIX] make the field text resize correctly

3608. By Fabien (Open ERP) on 2012-12-13

[IMP] useability highlight select when option checked