pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,473 Commits 1 Branch 0 Tags
ff8070033b4d29c1d156d59472084a7ce12da170
Commit Graph
2618 Commits
Author SHA1 Message Date
Christophe Simonis d70fde0330 [MERGE] forward port of branch saas-7 up to cab5c48 2016-02-10 18:37:01 +01:00
Denis Ledoux eb2346ba46 [MERGE] forward port of branch 9.0 up to 0b7990c 2016-02-08 16:08:32 +01:00
Christophe Matthieu 55c7d2d5b0 [FIX] web_editor: don't convert style into class by default. Only if use style-inline (because very poor performance for sale.order form view because contains very crappy dom in website_description field) 2016-02-08 12:20:10 +01:00
Odoo Translation Bot f2146d360d [I18N] Update translation terms from Transifex 2016-02-07 00:33:44 +01:00
Nicolas Lempereur 7c11d4e70f [FIX] web_editor: minor tweaks IE11 
In IE11 the values can be not string (for example a number and so not
have .indexOf method), but then there will no be !important bits and we
can just ignore this feature (which check if an overriding rule has an
!important flag).

There was another edge case when getting a "" set style, we get undefined.

opw-667917
 2016-02-04 16:50:22 +01:00
Raphael Collet bcfff7cea5 [FIX] web_editor: simplify inheritance specs 2016-02-04 15:52:05 +01:00
Christophe Simonis 04416a5a6f [MERGE] forward port of branch saas-9 up to 469e04e 2016-02-02 14:55:52 +01:00
Christophe Simonis 469e04e97c [MERGE] forward port of branch saas-8 up to 2611a81 2016-02-02 14:52:15 +01:00
Christophe Simonis e765569d04 [MERGE] forward port of branch 9.0 up to f0a63e5 2016-02-02 14:44:39 +01:00
Odoo Translation Bot 3b4bbb8c28 [I18N] Update translation terms from Transifex 2016-01-31 00:33:36 +01:00
Denis Ledoux 03173543a0 [MERGE] forward port of branch 9.0 up to 1982ef9 2016-01-28 17:27:34 +01:00
Christophe Matthieu d958cf541a [FIX] web_editor: enter keydown create new td only if the caret is on the last char of the last line of the td 2016-01-28 14:57:21 +01:00
Christophe Matthieu 2b4fb7e195 [FIX] web_editor: remove style attribute if empty 2016-01-28 14:57:21 +01:00
Denis Ledoux 15f1b79317 [MERGE] forward port of branch 9.0 up to 28e2dcf 2016-01-28 14:36:57 +01:00
Christophe Matthieu 51a1926353 [FIX] computed html field should not have "note-editable" class 
opw-660810
 2016-01-28 09:28:33 +01:00
Christophe Simonis 1231585df1 [MERGE] forward port of branch saas-9 up to 78d20b5 2016-01-27 12:27:01 +01:00
Christophe Simonis 78d20b552b [MERGE] forward port of branch saas-8 up to 7e44ddc 2016-01-27 12:24:04 +01:00
Yannick Tivisse c0b704d37c [IMP] Remove 'author' and 'website' on odoo modules' manisfest 
And use the default values :
- author : 'Odoo S.A.'
- website: https://www.odoo.com/
 2016-01-26 14:09:47 +01:00
Julien Legros e5e7c4c121 [MERGE] forward port of branch 9.0 up to 6872aae 2016-01-25 11:26:27 +01:00
Odoo Translation Bot 78a0a60b08 [I18N] Update translation terms from Transifex 2016-01-21 06:31:45 +01:00
Christophe Matthieu 3de1b4a4ac [FIX] web_editor: reduce the min-size of the html preview 
opw-660810
 2016-01-20 13:23:24 +01:00
Christophe Matthieu f93e03c4c7 [FIX] web_editor: can indent table cell (with button and tab) 
issue: the user select some line and keypress tab without indent, and the button indent doesn't work in table cell
 2016-01-20 13:23:24 +01:00
Christophe Matthieu 6e47472486 [FIX] web_editor: firefox can have undefined value for style and broke inliner feature 2016-01-20 13:23:23 +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 e5112ee00b [FIX] web_editor: use iframe only for html widget with style-inline mode 2016-01-20 00:15:10 +01:00
Julien Legros ddcc62c6dd [MERGE] forward port of branch 9.0 up to 365e298 2016-01-19 11:37:27 +01:00
Christophe Matthieu 365e298fb1 [FIX] web_editor: inliner don't apply color when background-color 2016-01-18 17:09:02 +01:00
Christophe Matthieu 57fe8147f3 [FIX] web_editor: don't add double p tag at the begin of the document 2016-01-18 17:09:02 +01:00
Christophe Matthieu 958656d7e6 [FIX] web_editor: inliner take in care the '!important' attributes 2016-01-18 17:09:01 +01:00
Christophe Matthieu b27d24bfe9 [FIX] web_editor: don't limit the css inliner to the class but for all tag 
(can reduce the performances)
 2016-01-18 17:09:01 +01:00
Christophe Matthieu da880a48db [FIX] web_editor: don't insert css inline for readonly html frame 
The preview is not equal to the real email rendering because inline.css is present.
 2016-01-18 17:09:01 +01:00
Christophe Matthieu 4e0e376b0a [FIX] web_editor: use iframe instead of direct content for preview 
The preview is not equal to the real email rendering because the backend css is present.
 2016-01-18 17:09:01 +01:00
Denis Ledoux 474baec1cf [MERGE] forward port of branch 9.0 up to ddd3e08 2016-01-15 16:46:32 +01:00
Odoo Translation Bot c7b01fea24 [I18N] Update translation terms from Transifex 2016-01-15 08:54:52 +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 faa7c750b2 [FIX] web_editor: change height for html field in readonly mode 
issue: breaks the preview form views
opw-660810
 2016-01-14 14:39:00 +01:00
Nicolas Lempereur 5c50ba322f [FIX] web_editor: title tag with translation 
b24d759 changed the wrapping translation span tags, this commit take it
into account for the "translation" title tag.
 2016-01-14 11:20:00 +01:00
Olivier Dony 39bd21fc47 [MERGE] Forward-port 9.0 up to rev. 3be9d911c0 2016-01-13 17:13:05 +01:00
Nicolas Lempereur 060cff9be3 [FIX] web_editor: get unlink button working 
f3f7bd9 improved some link editing behaviour by adding contenteditable
attribute on it.

But if contenteditable is set on a link, using command "unlink" on the
element for `document.execCommand` does not work.

Hence this commit adds a code so the first click outside the link remove
contenteditable.

closes #10436

second-part-of: opw-659772
 2016-01-13 16:28:29 +01:00
Christophe Matthieu 10efb0621f [FIX] website: editor: enable/disable save/undo/redo button when resize snippet 2016-01-13 16:05:22 +01:00
Christophe Simonis 740a6eadd3 [MERGE] forward port of branch saas-8 up to 3c7b08c 2016-01-12 18:48:49 +01:00
Christophe Simonis 9ad5c66a44 [MERGE] forward port of branch 9.0 up to 33299fd 2016-01-12 18:47:43 +01:00
Christophe Simonis 63c7488926 [MERGE] forward port of branch saas-8 up to 5f997bc 2016-01-12 16:12:32 +01:00
Christophe Simonis 7fa6f73302 [MERGE] forward port of branch 9.0 up to cb79297 2016-01-12 15:30:29 +01:00
Nicolas Lempereur b24d759036 [FIX] web_editor,base: transmit translation model 
There is a logic on the front-end to escape translated text content when
saving them as ir.translation record.

This logic was in part base on html elements and if these element were
not coming from an html field other than "ir.ui.view" arch_db's field.

This logic was introduced in 8.0, and something similar was later
introduced in 9.0 with f5acea7, but in this instance, the information
[data-oe-model] on nodes was not available. Thus some html field from
other model than ui.ui.view would have their translation escaped
erroneously.

This commit adds a data-oe-model attribute on to-be-translated nodes
which will then be available to the frontend.

closes #10420

first-part-of: opw-659772
 2016-01-12 15:14:07 +01:00
qsm-odoo cb79297a41 [FIX] web_editor: links edition (only website links) 
Commit f3f7bd9f24 adds an improvement which allows the user to edit links in
an easier way. The problem is that it also allowed to edit... the edit
buttons (example: the discard button).

This commit moves the mentionned commit code below the code that checks
if the target can be edited or not.
 2016-01-12 15:03:23 +01:00
Christophe Matthieu 0b2728d8b2 [FIX] web_editor: error when long delete keypress in mass_mailing html 
issue: event does not a global var in firefox, and event is already prevented
 2016-01-11 15:23:36 +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
Christophe Simonis 4852d6033d [MERGE] forward port of branch saas-8 up to 99b6cd8 2016-01-07 18:21:13 +01:00