pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,734 Commits 1 Branch 0 Tags
2bba0da0804cbd945d3c9fb01ca112d8cb5cd0da
Commit Graph
33 Commits
Author SHA1 Message Date
Christophe Simonis 868e718e09 [MERGE] forward port branch saas-15 up to 8d0942380b 2017-10-17 15:14:47 +02:00
Christophe Simonis cbca27d005 [MERGE] forward port branch 9.0 up to d5c0cae60b 2017-10-17 11:42:05 +02:00
qsm-odoo 296498fb58 [FIX] web_editor: do not break <p/> when pasting a <p/> element 
This fixes a bug when pasting text in a paragraph, it was always
creating a new paragraph for no reason.
 2017-10-16 14:14:47 +02:00
Christophe Matthieu 5dd23f7de2 [FIX] web_editor: prevent crash when publishing a payment in edit mode 
When updateStyleInfo is called, the options is not necessarily on
editable area (eg: when update the toolbar for image)
 2017-05-04 17:19:25 +02:00
Christophe Simonis 856476d441 [MERGE] forward port branch saas-12 up to b1b700a 2016-09-22 15:23:45 +02:00
Christophe Simonis b1b700adb1 [MERGE] forward port branch saas-11 up to 6854887 2016-09-22 14:23:07 +02:00
Christophe Matthieu ab06013e30 [FIX] mass_mailing: can't change color button snippet when edit mass mailing 2016-09-21 16:14:49 +02:00
Martin Geubelle e59a7fe3ff [REF] web_editor, website: move ACE editor to web_editor 2016-09-01 17:15:01 +02:00
qsm-odoo f196afc80b [IMP] web_editor: come back to a more regular summernote colorpicker 
Splitting the summernote colorpicker into bg colorpicker and foreground
colorpicker seems to have been a bad idea as people tend to click on
the recent color button thinking it will open a dropdown.

This commit keeps the design that had been decided for colorpicker
template and do not change the "background-color" snippet option.
However, the colors for background and foreground text changes are
now displayed in an unique dropdown again, with reviewed style.

+ adapt the rte tour
 2016-08-19 17:44:27 +02:00
qsm-odoo 73898ccb8b [IMP] web_editor: change image edition toolbar 
* Move description button at the end of the toolbar
* Add an "auto" state button for the image width (alongside 100%,
50% and 25%) (when these last three are unchecked, the auto button
becomes checked).
 2016-07-05 18:05:24 +02:00
Christophe Matthieu 025263d3bf Revert "[FIX] web_editor: test jinja content to load editor in codeview" 
This reverts commit f38f8930f0.

Revert for internal choice. Odoo want to use qweb in template and remove jinja support on next version.
If users want to use jinja they can change the view to use text widget instead of html widget.
 2016-06-23 11:45:17 +02:00
Christophe Matthieu f38f8930f0 [FIX] web_editor: test jinja content to load editor in codeview 
The preview change the content because the browser try to fix the dom.
If a user use jinja and activate the preview, the jinja code is (re)moved by the browser and broke the template.
 2016-06-22 14:26:42 +02:00
qsm-odoo 6610d05549 [REF] web_editor,website,mass_mailing: JS/XML update 
* Adapt DOM selectors
* Refactore dialog XMLs to have odoo styling
* New editor options (background-position, ...)
* Various improvements
 2016-02-24 13:47:36 +01:00
qsm-odoo 5b65befcd8 [REF] web,web_editor,website,report,mass_mailing,mail: LESS 
* Convert some CSS to LESS
* Split/Join LESS files
* Remove duplicates between website and web_editor
* UI improvements
* Allow simple customizations thanks to LESS var&mixins for website
 2016-02-24 13:09:48 +01:00
stefanorigano c4a896a8a0 [REF] website,web_editor: complete restyling 2016-02-24 11:15:55 +01:00
Christophe Matthieu 2ef6e249d0 [FIX] web_editor: merge span when paste, only if no content between tags 
opw-667263
 2016-01-20 13:23:23 +01:00
Christophe Matthieu 86b80689d7 [FIX] web_editor: remove empty table ligne when paste content 2016-01-20 13:23:23 +01:00
Christophe Matthieu 6e1ed6c8bb [FIX] web_editor: paste simple text must wrap first line by p and remove unless font 2016-01-14 15:21:39 +01:00
Christophe Matthieu 50057c08aa [FIX] web_editor: clean pasted dom and avoid crappy dom 
Chrome on windows add few comment tags and insert unwanted span.
 2016-01-11 15:20:49 +01:00
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 56aa103a43 [FIX] web_editor: useless margin for air editor in translation 2015-09-30 11:27:00 +02:00
Nicolas Lempereur 142a3e4176 [IMP] web_editor: rename and delete summernote files 2015-09-29 14:47:37 +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 a3d355ada7 [WIP] web_editor: rename and delete old summernote files 2015-09-25 08:30:17 +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 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 5d51aff938 [FIX] summernote: insert a p tag when try to insert a br with insertNode method, if the editor is inside a p, li, h1... 2015-07-10 17:00:16 +02:00
Christophe Matthieu 0333941b5f [FIX] web_editor: summernote: with firefox error to record an undo for the normal instance of the editor because global variable 'event' does not exists. 2015-07-10 17:00:14 +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 77d848d4f5 [FIX] web_editor: summernote: editor fail if at least 10 instance of summernote are create (wrong split to get sumernote instance id) 2015-07-10 17:00:13 +02:00
Christophe Matthieu cebc73ebf9 [IMP] web_editor: move summernote & nearest lib from website 2015-07-10 17:00:13 +02:00