Commit Graph
16 Commits
Author SHA1 Message Date
Nicolas Lempereur cbb8799b6f [FIX] web_editor, mass_mailing: summernote oversight and video
* some oversight when updating summernote with d33086c,
* fix style when replacing image with video
2015-10-02 12:24:05 +02:00
Nicolas Lempereur d33086c03f [IMP] web_editor: update summernote up to 2015-08-31
update summernote library up to revision:
 https://github.com/summernote/summernote/commit/a0f26e300

see https://github.com/summernote/summernote/ for history

closes #8704
2015-09-29 14:47:24 +02:00
Nicolas Lempereur eed63c793a Revert "[IMP] web_editor: update summernote up to 2015-08-31"
Revert till several issues are solved.
2015-09-25 10:53:08 +02:00
Nicolas Lempereur 7747e0751f [IMP] web_editor: update summernote up to 2015-08-31
update summernote library up to revision:
 https://github.com/summernote/summernote/commit/a0f26e300

see https://github.com/summernote/summernote/ for history

closes #8704
2015-09-25 08:29:16 +02:00
Christophe Simonis 57168a9e90 [MERGE] forward port of branch saas-6 up to a669433 2015-09-23 14:34:26 +02:00
Nicolas Lempereur a134c88d00 [FIX] web_editor: do paste after removing selection 2015-09-04 11:54:05 +02:00
Christophe Simonis 044c0625ad [MERGE] forward port of branch saas-6 up to 7faf72c 2015-08-31 19:57:20 +02:00
Christophe Simonis 10a417c63d [FIX] web_editor: don't loose selection when deleting an image 2015-08-31 17:23:16 +02:00
Christophe Simonis a9abf18125 [FIX] web_editor: sould not delete de tag container when select all text inside (although there are several selected child nodes)
This is forward-port of 96b33cdbce that
was stuck in limbo in forward-ports...
2015-08-28 19:16:03 +02:00
Christophe Simonis edeceba7df [MERGE] forward port of branch saas-6 up to 7a768a4
Due to `sale` rewrite (94716a3f14),
the commit 503820acb6 has been partially
ignored (in sale.order.line) and will be rewritten later using new-api.
2015-08-28 15:07:16 +02:00
Christophe Simonis 88c0ce0692 [MERGE] forward port of branch saas-6 up to e16d495 2015-08-24 18:19:19 +02:00
Christophe Simonis 2cf91d16a5 [MERGE] forward port of branch saas-6 up to 63e92cb 2015-07-22 16:17:54 +02:00
Christophe Matthieu 7f29771833 [FIX] summernote: wrong history managment fixed to use in normal field editor 2015-07-10 17:00:14 +02:00
Christophe Matthieu 9221eb5b6d [FIX] web_editor: summernote: don't create display button to edit table if the editable part is inside the table 2015-07-10 17:00:13 +02:00
Christophe Matthieu 9665882fba [IMP] web_editor: adapt css, js and xml to use web_editor 2015-07-10 17:00:12 +02:00
Christophe Matthieu 8c559044a5 [IMP] web_editor: split website into web_editor (to use editor in backend for html field) and website 2015-07-10 17:00:11 +02:00