d4984b81e6b244297e192f2be2768ed11da170aa
5
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 qsm-odoo
|
e5572c317a |
[REV] web_editor, *: remove Jabberwock
*: barcodes, mail, mass_mailing, note, test_website, web, web_tour, website, website_blog, website_event, website_form, website_forum, website_mail_channel, website_mass_mailing, website_profile, website_sale, website_twitter, doc New solutions are being investigated in master. For the moment, it seems better to remove Jabberwock to unlock difficult forward-port between 14.0 and 14.1/master, until we decide what to do once and for all in a later master. We may un-revert this later but that would be way easier than reverting Jabberwock in a few months. This was done as safely as possible by removing any commit related to Jabberwock, then resolving conflicts, then reforcing commits from 14.0 that were hugely adapted for 14.1/master, then forcing the whole diff over a rebased 14.1/master. The only possible miss (other than me making a mistake) would be commits that were not forward-ported to 14.1 thanks to Jabberwock handling the issue on its own (I know we had such commits in website, which I manually included in this revert, see below). For reference: Commits which were reforced to their 14.0 version: - https://github.com/odoo/odoo/commit/1a916fc2362c0b006460d94a219366ade1cce058 - https://github.com/odoo/odoo/commit/fd9e58a675bb7ec1bf97cb77b21b3c65369d51fe - https://github.com/odoo/odoo/commit/bdfddace29b16404c06a7ebfc0cc242463a0e768 - https://github.com/odoo/odoo/commit/42b3ad10e0b32b7fc72f801e2c67d6baf938c566 - https://github.com/odoo/odoo/commit/710784da1f02d45cbe898da426ba7e2ac63dc711 - https://github.com/odoo/odoo/commit/597585c9b8b1350bcfd84e8433ea6c82060bcc3d - https://github.com/odoo/odoo/commit/333a9124608ff655bd9ad5e63044a5cb7ef9c636 Commits that were not forward-ported to 14.1/master and now are: - https://github.com/odoo/odoo/commit/55ff2d971b672dec5f103215be39101c88856b6c - https://github.com/odoo/odoo/commit/ebbb3de1e5f363689a5ba1647bb4c26416e42d5b + Adapt this forward-port: https://github.com/odoo/odoo/pull/60976 (as it was simplified for non-stable master version relying to the Jabberwock implementation and now needed to be adapted to the summernote implementation). See `!$el.data('oe-expression') && $el.data('oe-xpath')` + Revert https://github.com/odoo/odoo/pull/60477 and reforce original 14.0 fix https://github.com/odoo/odoo/commit/746bf53b4aecfc601f0581a948d7cb7153812c82 Note: this also means that any good refactoring that was done by the Jabberwock-related commits is lost for now. Once the revert reaches master, I'll try and restore what we want from those commits. Here are their references (but obviously they have the opposite conflicts than those resolved during this revert): e766842a92b6 [REM] web_editor,website: empty summernote files 08c94c986e09 [REF] web_editor,web: adapt to new jabberwock editor 1546c1b74713 [REF] mass_mailing: adapt to new jabberwock editor fd0b963c6028 [REF] website: adapt to new jabberwock editor 0113d05c6c94 [ADD] web_editor: add new Jabberwock editor lib d0c88a396493 [FIX] web_editor: don't change background color out of the website editor d52d3d67d4e1 [FIX] web_editor : better icon in text style dropdown 61cb2f0d21da [FIX] web_editor: should not ask if want to leave the page twice c42012b863b5 [FIX] web_editor: trigger a resize when use the mobile preview d934d05d6e39 [FIX] web_editor: need to build the snippet before commit it into vDom 495bea924745 [FIX] web_editor: remove box shadow on the #wrap container bffb5612e689 [ADD] field_html: add resizer in most field_html f3c94e40cccf [IMP] web_editor: update Jabberwock library to commit 41e4063 cc87dea3ef32 [FIX] web_editor: update header change position to work with JW 5d9b25f66704 [FIX] web_editor: do not insert chars around step icon on click 70d3f0e4630c [IMP] web_editor: update Jabberwock library to commit 0bd94881 a57f13891f82 [FIX] web_editor: open media modal in appropriate tab on dblclick media 5b7537397e08 [IMP] web_editor: update Jabberwock library to commit a7ba7c34 a8d7ec235eeb [FIX] web_editor: adapt iframe Qunit test to new editor 5f794eac7209 [FIX] mass_mailing: hide all panels on show themes 551d45641d19 [IMP] website: remove unused reference 10580e1c102f [IMP] wesbite: add comment in tour c17049f6b764 [FIX] web_editor: Fix description toggle in pricelist snippet 18a428e854b1 [IMP] web_editor: update Jabberwock library to commit 43a10003 58a161c645a5 [REF] web_editor, website: use editor helper setClass 62dd0bd3bc66 [FIX] web_editor: properly deactivate snippets and reactivate the last 99eebcaa34cb [FIX] web_editor: disable snippet in preview mode on mouse leave options a84216932958 [FIX] web_editor: fix the image gallery snippet f8dd4ea3e7d5 [FIX] web_editor: fix shadow selector for Safari e50a4f3a16de [IMP] web_editor: update Jabberwock library to commit de13ed7e 4a2718f7a5ba [FIX] web_editor: ensure dom is properly cleaned at end of save test 03684c004a4e [FIX] website: ensure reset of bg-image on add bg-video d63397159708 [FIX] web_editor: fix image remove from images wall 82fa5142f1a5 [IMP] note: restyle note without sheet or resizer 8b9f1ce603d5 [FIX] web_editor: properly mock createWysiwygIntance (sic) in tests fc2183b66305 [FIX] web_editor: image overlay did not update with changes cd0d2f5791cd [FIX] web_editor: add color preview to color picker 28a168172454 [FIX] web_editor: restore removal of spinner 67c90dd3b946 [FIX] website_forum: properly initialize editor 920dfe2a430a [FIX] website_forum: better css in the JW toolbar 43f33fd651af [IMP] web_editor: update Jabberwock library to commit 6853b60 71246c92f8de [FIX] Web_editor: table options button should be inside the toolbar 12b9e5916692 [FIX] web_editor: properly update the image options on replace image e889cf8583da [FIX] website, website_sale: properly save filter id of dynamic snippets e0fd11e36e45 [IMP] web_editor: update Jabberwock library to commit 4b2c903b 8f2b7ba35614 [FIX] web_editor: properly stop snippet option changed event propagation a30c2c4105c7 [FIX] website: fix megamenu snippet editor behavior 312091cf822b [FIX] web_editor: fix overlay that is not reappearing 9f1d03dda613 [FIX] web_editor: table picker not fully displayed 814ddada6124 [IMP] web_editor: remove message before leaving page if editor is destro 4f38e26af7da [FIX] web: allow saving copyright footer 01e947b6123b [FIX] web_editor: only save translations that changed 103676072c50 [FIX] web_editor: prevent traceback on open crop dialog 5844ff66d4a0 [FIX] web_editor: apply image crop in jw on save dialog 1b435652e4a0 [FIX] website_forum: ensure media modal opens on click button 4f4a6ca0b8ac [FIX] web_editor: ensure valid default html value 51e22026ac7b [IMP] web_editor: update Jabberwock library to commit ab1184f8 2413fa19be0e [FIX] web_editor: Qunit test properly wait for editor stop aa89e1ea3e97 [FIX] web_editor: properly save view blocks with an id e2e90b53992e [FIX] web_editor: ensure language selector is non editable 0efd72089d5c [IMP] web_editor: clean useless lines f54dfc7631f9 [IMP] web_editor: remove useless comment 3995ab1b84f2 [IMP] web_editor: update Jabberwock library to commit b8d73691 0834b1e5740a [IMP] web_editor: withDomMutations f1459fb7b45c [FIX] web_editor: fix non-deterministic error in QUnit wysiwyg tests 6e8acc6c8cc7 [IMP] web_editor: update Jabberwock library to commit 3bbb175c 18a0c95d51cb [FIX] website, web_editor: #wrapwrap in body 4686a92e742c [FIX] website_form: allow edition of success message 78cc4da075cc [FIX] web_editor: allow edition of branded nodes only bcffa7353448 [FIX] web: dialog should not use field value footer items 67ff56e14746 [FIX] web_editor,website_mass_mailing: display the popup preview 3cb9bea50c20 [IMP] web_editor: update Jabberwock library to commit a20492ea 518f03e6f1c9 [FIX] web_editor: use withIntangibles to find ZoneNode d0ad6a568f49 [FIX] website: move sidebar out of theme d690f5da13ea [FIX] website: properly save popup id 43b3433df3e6 [FIX] web_editor: fix non-deterministic error in QUnit wysiwyg tests 4ee8f4dedc30 [FIX] web_editor: prevent deadlock when removing child snippet of popup 850be198ef6d [FIX] web_editor: prevent traceback on reposition background image 4c3eaba41f5d [FIX] mass_mailing: adapt tour to the new editor design. 496d3ea272ed [FIX] web_editor: properly position sidebar scrollbar 5be4de703074 [FIX] web_editor: Show the toolbar when select the text in forum edition closes odoo/odoo#63768 Related: odoo/enterprise#15458 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com> |
||
|
|
6d6f42f489 |
[REF] website: adapt to new jabberwock editor
Co-authored-by: Nicolas Bayet <nby@odoo.com> Co-authored-by: Sébastien Geelen <sge@odoo.com> Co-authored-by: Antoine Guenet <age@odoo.com> Co-authored-by: Christophe Matthieu <chm@odoo.com> Co-authored-by: David Monjoie <dmo@odoo.com> |
||
|
qsm-odoo
|
08f054199e |
[FIX] web_editor, *: wait for drag & drop ending before saving
*: website This is not the cleanest of fixes because the original code have to be refactored first but this solves the problem we had *sometimes* when drag and dropping a snippet then immediately saving (only saw the bug in automatic tests): same as all snippet options, the operation had to be mutexed so that saving is done after its full execution. Part of https://github.com/odoo/odoo/pull/57975 task-2344227 X-original-commit: 277f39904e7218bef2dd23b1c5b719ce8660008f |
||
|
Benjamin Vray
|
a2fd2dacd9 |
[IMP] website: review carousel snippet
Add the width option for each slides in the carousel snippet. Remove share links from the third slide of the carousel. Part of https://github.com/odoo/odoo/pull/45096 task-2162952 |
||
|
fja-odoo
|
11c60739e4 |
[IMP] website, *: warn user about outdated blocks
* = mass_mailing, web_editor, website_crm, website_event, website_form, website_forum, website_hr_recruitment, website_mail_channel, website_mass_mailing, website_sale, website_slides When an outdated snippet's option are activated we display a warning in the left panel that inform the user about the potential malfunctions. To do so the snippet's template key is added to the snippet as data-snippet. If a snippet is "t-call" inside another snippet, it will need to use t-snippet-call instead of t-call to have the key on himself. Those unique keys are used on snippet selection to retrieve the snippet's version in the left panel and compare it with the currently selected snippet's version. Versions are describe with data-vcss, data-vjs and data-vxml. If a snippet's key is not in the left panel we consider that snippet as outdated. Added some tests to ensure that t-snippet and t-snippet-call really have their template key as data-snippet Adapted the views to the data-snippet changes adding data-snippet="tmpl_key". Part of: https://github.com/odoo/odoo/pull/44569 task-2189669 closes odoo/odoo#50254 X-original-commit: 28a6cd49b6e87b75c2e70771e241c41778bf9e87 Related: odoo/enterprise#10236 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com> |