Merge pull request #2622 from douakli/XWIKI-19180
XWIKI-19180: In case of merge conflict choosing "Reload editors" won't refresh the content
No related branches found
No related tags found
Showing
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml 0 additions, 131 deletions...atform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml 0 additions, 64 deletions...realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java 0 additions, 118 deletions.../test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js 54 additions, 383 deletions...e/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js 5 additions, 0 deletions...atform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml 7 additions, 0 deletions...-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java 122 additions, 0 deletions...iki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java 2 additions, 1 deletion...iki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js 15 additions, 3 deletions...latform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js 17 additions, 8 deletions...atform-realtime-wysiwyg-webjar/src/main/webjar/patches.js
- xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js 8 additions, 33 deletions...-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
Loading
Please register or sign in to comment