diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000000..95853ff1bd58 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,11 @@ +backport stable-16.0.x: + - head-branch: ['^weblate'] + +backport stable-15.10.x: + - head-branch: ['^weblate'] + +backport stable-15.5.x: + - head-branch: ['^weblate'] + +backport stable-14.10.x: + - head-branch: ['^weblate'] \ No newline at end of file diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 000000000000..971e8a65022c --- /dev/null +++ b/.github/workflows/backport.yml @@ -0,0 +1,26 @@ +name: Backport +on: + pull_request_target: + types: + - closed + - labeled + +jobs: + backport: + name: Backport + runs-on: ubuntu-latest + # Only react to merged PRs for security reasons. + # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. + if: > + github.event.pull_request.merged + && ( + github.event.action == 'closed' + || ( + github.event.action == 'labeled' + && contains(github.event.label.name, 'backport') + ) + ) + steps: + - uses: tibdex/backport@v2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 000000000000..659ac26bb95e --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,12 @@ +name: "Pull Request Labeler" +on: + - pull_request_target + +jobs: + labeler: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v5 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1d6c25d2ad70..3cbce2649db1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.xwiki.commons xwiki-commons-pom - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT @@ -61,7 +61,7 @@ 9.4.53.v20231009 10.0.19 ${jetty.client.version} - 4.1.104.Final + 4.1.105.Final 5.6.15.Final 3.3.4 1.4.2 @@ -69,7 +69,7 @@ 3.9.1 - 1.19.3 + 1.19.4 @@ -1167,6 +1167,19 @@ + + org.webjars.npm + vue + 2.7.16 + + + + org.webjars.npm + vue__compiler-sfc + + + @@ -1510,6 +1523,11 @@ esversion:11,maxparams:5,maxdepth:3,maxstatements:20,maxcomplexity:10,camelcase,maxlen:120 + + com.github.eirslett + frontend-maven-plugin + 1.15.0 + diff --git a/xwiki-platform-core/pom.xml b/xwiki-platform-core/pom.xml index 28daadf9a0b4..f9d92a43e7a9 100644 --- a/xwiki-platform-core/pom.xml +++ b/xwiki-platform-core/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-core XWiki Platform - Core - Parent POM @@ -125,87 +125,9 @@ Single justification example: --> - - Those APIs are still available with legacy packages. - allowed - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.XWiki::addTooltip(java.lang.String, java.lang.String, com.xpn.xwiki.XWikiContext) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.XWiki::addTooltip(java.lang.String, java.lang.String, java.lang.String, com.xpn.xwiki.XWikiContext) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.XWiki::addTooltipJS(com.xpn.xwiki.XWikiContext) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.api.Document::displayTooltip(java.lang.String) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.api.Document::displayTooltip(java.lang.String, com.xpn.xwiki.api.Object) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.doc.XWikiDocument::displayTooltip(java.lang.String, com.xpn.xwiki.XWikiContext) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.doc.XWikiDocument::displayTooltip(java.lang.String, com.xpn.xwiki.objects.BaseObject, com.xpn.xwiki.XWikiContext) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.api.XWiki::addTooltip(java.lang.String, java.lang.String) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.api.XWiki::addTooltip(java.lang.String, java.lang.String, java.lang.String) - - - true - java.method.removed - method java.lang.String com.xpn.xwiki.api.XWiki::addTooltipJS() - - - - - - - allowed - java.class.nonFinalClassInheritsFromNewClass - class org.xwiki.filter.instance.output.DocumentInstanceOutputProperties - class org.xwiki.filter.instance.output.DocumentInstanceOutputProperties - org.xwiki.filter.instance.output.EntityInstanceOutputProperties - Not a breakage, the old DocumentInstanceOutputProperties content has been moved to the new EntityInstanceOutputProperties class and old class now inherits from the new one - - - - - - - true - java.class.nonFinalClassInheritsFromNewClass - class org.xwiki.livedata.macro.LiveDataMacroParameters - class org.xwiki.livedata.macro.LiveDataMacroParameters - org.xwiki.livedata.internal.LiveDataRendererParameters - Not a runtime breaking change. - allowed - - - + + + diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml index 92f343f9f3d8..ffc89a2197dc 100644 --- a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml +++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-activeinstalls2 XWiki Platform - Active Installs 2 - Parent POM @@ -33,7 +33,7 @@ Parent POM for the Active Installs 2 modules - 8.11.2 + 8.12.1 diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml index d469f17104a9..12ec727b7437 100644 --- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml +++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-activeinstalls2 - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-activeinstalls2-api XWiki Platform - Active Installs 2 - API diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml index 35fec467e104..a44699ab3b6d 100644 --- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-activeinstalls2 - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-activeinstalls2-test XWiki Platform - Active Installs 2 - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml index 19a0324d0ec0..6734b31a10ab 100644 --- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-activeinstalls2-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-activeinstalls2-test-docker XWiki Platform - Active Installs 2 - Tests - Functional Docker Tests diff --git a/xwiki-platform-core/xwiki-platform-administration/pom.xml b/xwiki-platform-core/xwiki-platform-administration/pom.xml index fd03415f808f..9d3e87aaa64f 100644 --- a/xwiki-platform-core/xwiki-platform-administration/pom.xml +++ b/xwiki-platform-core/xwiki-platform-administration/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-administration XWiki Platform - Administration - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml index e1902a4306b6..a8bd29723919 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-administration - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-administration-test XWiki Platform - Administration - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml index 3e3efda2b8c0..f56f138f2b65 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-administration-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-administration-test-docker XWiki Platform - Administration - Tests - Functional Docker Tests @@ -64,6 +64,13 @@ ${project.version} xar + + + org.xwiki.platform + xwiki-platform-user-profile-ui + ${project.version} + xar + diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java index 3c8a7371b955..9115d3fa01f1 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java @@ -45,7 +45,9 @@ @UITest(properties = { // Add the RightsManagerPlugin needed by the test - "xwikiCfgPlugins=com.xpn.xwiki.plugin.rightsmanager.RightsManagerPlugin" + "xwikiCfgPlugins=com.xpn.xwiki.plugin.rightsmanager.RightsManagerPlugin", + // Programming rights are required to disable/enable user profiles (cf. XWIKI-21238) + "xwikiPropertiesAdditionalProperties=test.prchecker.excludePattern=.*:XWiki\\.XWikiUserProfileSheet" }) public class UsersGroupsRightsManagementIT { diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml index 2f5feeaa4a4b..8397f1b268b8 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-administration-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-administration-test-pageobjects XWiki Platform - Administration - Tests - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java index d66beb3e32ba..9958b05e30bc 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LocalizationAdministrationSectionPage.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.List; +import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.xwiki.test.ui.po.BootstrapSelect; @@ -52,7 +53,8 @@ public LocalizationAdministrationSectionPage() waitUntilActionButtonIsLoaded(); // Wait for asynchronous widgets to be loaded getDriver().waitUntilCondition(driver -> multiLingualSelect.isDisplayed() && defaultLanguageSelect.isDisplayed() - && supportedLanguagesSelect.isDisplayed()); + && (multiLingualSelect.findElement(By.xpath(".//option[@value='0']")).isSelected() + || supportedLanguagesSelect.isDisplayed())); } public void setMultiLingual(boolean isMultiLingual) diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml index da4e2d0a1461..b72c1b1e47e1 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-administration - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-administration-ui XWiki Platform - Administration - UI diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml index 642395c80352..4aaa605a49dc 100644 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml +++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminLocalizationSheet.xml @@ -441,4 +441,130 @@ require(['jquery', 'xwiki-l10n!xwiki-administration-localization', 'xwiki-locale currentPage + + XWiki.AdminLocalizationSheet + 0 + XWiki.StyleSheetExtension + 3af35852-ce5c-402a-8a09-16ee04654aac + + XWiki.StyleSheetExtension + + + + + + + + + 0 + long + 0 + select + forbidden + 0 + 0 + cache + 5 + Caching policy + 0 + + |, + 1 + 0 + long|short|default|forbid + com.xpn.xwiki.objects.classes.StaticListClass + + + PureText + 0 + PureText + code + 2 + Code + 0 + 20 + 50 + 0 + com.xpn.xwiki.objects.classes.TextAreaClass + + + 0 + 0 + select + forbidden + 0 + 0 + contentType + 6 + Content Type + 0 + + |, + 1 + 0 + CSS|LESS + com.xpn.xwiki.objects.classes.StaticListClass + + + 0 + name + 1 + Name + 30 + 0 + com.xpn.xwiki.objects.classes.StringClass + + + 0 + select + yesno + parse + 4 + Parse content + 0 + com.xpn.xwiki.objects.classes.BooleanClass + + + 0 + 0 + select + forbidden + 0 + 0 + use + 3 + Use this extension + 0 + + |, + 1 + 0 + currentPage|onDemand|always + com.xpn.xwiki.objects.classes.StaticListClass + + + + long + + + /* Do not display the supported language field (we assume it's the following one) + when the multilingual option is set to No. */ +form#localization dd:has(> div.dropdown > select[name="XWiki.XWikiPreferences_0_multilingual"] > option[value="0"]:checked) + dt, +form#localization dd:has(> div.dropdown > select[name="XWiki.XWikiPreferences_0_multilingual"] > option[value="0"]:checked) + dt + dd { + display: none; +} + + + + + + + + + + + + currentPage + + diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml deleted file mode 100644 index 304803ba2733..000000000000 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ForgotUsername.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - XWiki - ForgotUsername - - - 0 - xwiki:XWiki.Admin - Main.WebHome - xwiki:XWiki.Admin - xwiki:XWiki.Admin - 1.1 - $services.localization.render('xe.admin.forgotUsername.title') - - false - xwiki/2.1 - true - {{velocity}} -#set ($newUrl = $services.security.authentication.getAuthenticationURL('retrieveusername', $request.parameterMap)) -#set ($discard = $services.logging.deprecate("ForgotUsername", "The page [XWiki.ForgotUsername] should not be used anymore in favor of the new 'authenticate/retrieveusername' URL.")); -#set ($discard = $response.sendRedirect($newUrl)) -{{/velocity}} - - XWiki.ForgotUsername - 0 - XWiki.XWikiRights - 5f9081d2-87b6-430e-8bb9-edc66544fc06 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 0 - - - XWiki.XWikiAllGroup - - - edit - - - XWiki.XWikiGuest - - - - XWiki.ForgotUsername - 1 - XWiki.XWikiRights - 54be8bc6-c81a-4149-b2b0-161b2b974857 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 0 - - - xwiki:XWiki.XWikiAllGroup - - - edit - - - - - - - XWiki.ForgotUsername - 2 - XWiki.XWikiRights - 06daec64-228b-4da1-b7e6-b59d9624c859 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 1 - - - XWiki.XWikiAllGroup - - - view - - - XWiki.XWikiGuest - - - diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml deleted file mode 100644 index 243841e84a4b..000000000000 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPassword.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - XWiki - ResetPassword - - - 0 - xwiki:XWiki.Admin - Main.WebHome - xwiki:XWiki.Admin - xwiki:XWiki.Admin - 1.1 - $services.localization.render('xe.admin.passwordReset.title') - - false - xwiki/2.1 - true - {{velocity}} -#set ($newUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $request.parameterMap)) -#set ($discard = $services.logging.deprecate("ResetPassword", "The page [XWiki.ResetPassword] should not be used anymore in favor of the new 'authenticate/resetpassword' URL.")); -#set ($discard = $response.sendRedirect($newUrl)) -{{/velocity}} - - XWiki.ResetPassword - 0 - XWiki.XWikiRights - 8a0e8611-2818-4181-a8e9-1d1623ac3e77 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 0 - - - XWiki.XWikiAllGroup - - - edit - - - XWiki.XWikiGuest - - - - XWiki.ResetPassword - 1 - XWiki.XWikiRights - bb00007c-00dd-4423-9b7b-b87896c947fb - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 0 - - - xwiki:XWiki.XWikiAllGroup - - - edit - - - - - - - XWiki.ResetPassword - 2 - XWiki.XWikiRights - 06daec64-228b-4da1-b7e6-b59d9624c866 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 1 - - - XWiki.XWikiAllGroup - - - view - - - XWiki.XWikiGuest - - - diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml deleted file mode 100644 index 0842a8c74070..000000000000 --- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - XWiki - ResetPasswordComplete - - - 0 - xwiki:XWiki.Admin - XWiki.ResetPassword - xwiki:XWiki.Admin - xwiki:XWiki.Admin - 1.1 - $services.localization.render('xe.admin.passwordReset.step2.title') - - false - xwiki/2.1 - true - {{velocity}} -#set ($newUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $request.parameterMap)) -#set ($discard = $services.logging.deprecate("The page [XWiki.ResetPasswordComplete] should not be used anymore in favor of the new 'authenticate/resetpassword' URL.")); -#set ($discard = $response.sendRedirect($newUrl)) -{{/velocity}} - - XWiki.ResetPasswordComplete - 0 - XWiki.XWikiRights - 7fd88649-d66d-442a-bcee-bc4147e410a7 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 0 - - - XWiki.XWikiAllGroup - - - edit - - - XWiki.XWikiGuest - - - - XWiki.ResetPasswordComplete - 1 - XWiki.XWikiRights - e0264a66-4a10-4d7e-822e-6863e3caaa18 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 0 - - - xwiki:XWiki.XWikiAllGroup - - - edit - - - - - - - XWiki.ResetPasswordComplete - 2 - XWiki.XWikiRights - 06daec64-228b-4da1-b7e6-b59d9624c856 - - XWiki.XWikiRights - - - - - - - - - 1 - 0 - select - allow - allow - 4 - Allow/Deny - 0 - com.xpn.xwiki.objects.classes.BooleanClass - - - 0 - 0 - input - 1 - groups - 1 - 1 - Groups - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.GroupsClass - - - 0 - 0 - select - 1 - levels - 2 - Levels - 0 - - 3 - 0 - com.xpn.xwiki.objects.classes.LevelsClass - - - 0 - 0 - input - 1 - users - 3 - 1 - Users - 0 - - 5 - 0 - com.xpn.xwiki.objects.classes.UsersClass - - - - 1 - - - XWiki.XWikiAllGroup - - - view - - - XWiki.XWikiGuest - - - diff --git a/xwiki-platform-core/xwiki-platform-alerts/pom.xml b/xwiki-platform-core/xwiki-platform-alerts/pom.xml index 4b29d3a7579a..e800226c2e30 100644 --- a/xwiki-platform-core/xwiki-platform-alerts/pom.xml +++ b/xwiki-platform-core/xwiki-platform-alerts/pom.xml @@ -25,10 +25,10 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-alerts - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT XWiki Platform - Alerts - Parent POM pom Application that adds an "alert" menu in the skin. diff --git a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml index 2e4fb1f2eda1..16f702428745 100644 --- a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml @@ -25,10 +25,10 @@ org.xwiki.platform xwiki-platform-alerts - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-alerts-ui - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT XWiki Platform - Alerts - UI xar diff --git a/xwiki-platform-core/xwiki-platform-annotation/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/pom.xml index 4ca7396a7adc..e98344bb854b 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation XWiki Platform - Annotations - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml index 31a1f754d06b..088b495acbd2 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-core XWiki Platform - Annotations - Core Services diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml index be489ffa40ff..e755aebd69f0 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-io XWiki Platform - Annotations - XWiki Storage Implementation diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml index ebc611ea5bfd..20fb07ea354e 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-maintainer XWiki Platform - Annotations - Maintainer diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml index 9097b691d37e..8603200b2d49 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-reference XWiki Platform - Annotations - References Manipulation diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml index 555261ba27aa..8aecc2235cd4 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-rest XWiki Platform - Annotations - REST Services diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml index a5d64bb400c2..7940b05044d3 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-scripting XWiki Platform - Annotations - Scripting APIs diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml index aa0dc74af100..271c887380f7 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-test XWiki Platform - Annotations - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml index ec8980106e2d..cbe0ab37f592 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-test-docker XWiki Platform - Annotation - Test - Functional Docker Tests diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml index 1525ca8905ab..dd9ac82424ec 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-annotation-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-test-pageobjects XWiki Platform - Annotations - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml index 228db37daaa7..ab5cac75e85f 100644 --- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-annotation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-annotation-ui XWiki Platform - Annotations - UI diff --git a/xwiki-platform-core/xwiki-platform-application/pom.xml b/xwiki-platform-core/xwiki-platform-application/pom.xml index 9119e828481b..ed124517df10 100644 --- a/xwiki-platform-core/xwiki-platform-application/pom.xml +++ b/xwiki-platform-core/xwiki-platform-application/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-application XWiki Platform - Application - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml index e2d15fb0386c..0ad9cd101f85 100644 --- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-application - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-application-test XWiki Platform - Application - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml index d07c2d95b8bd..a014ce70677c 100644 --- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-application-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-application-test-pageobjects XWiki Platform - Application - Tests - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml index d5bb13672726..0cd6aeccd445 100644 --- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-application - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-application-ui XWiki Platform - Application - UI diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml index a784e05c0c2f..0a57dd2bc107 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-appwithinminutes XWiki Platform - App Within Minutes diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml index 1db8279ea7a5..a62bf31b3a73 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-appwithinminutes - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-appwithinminutes-test XWiki Platform - App Within Minutes - Test - Parent diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml index 98b38bf5c0c7..50364c8a1cfa 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-appwithinminutes-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-appwithinminutes-test-docker XWiki Platform - AppWithinMinutes - Tests - Functional Docker Tests diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml index 3074ef9a9de0..fec9a5633271 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-appwithinminutes-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-appwithinminutes-test-pageobjects XWiki Platform - App Within Minutes - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml index 275ab2250437..a64a5a726854 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-appwithinminutes - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-appwithinminutes-ui XWiki Platform - App Within Minutes - UI diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml index a05207b004bb..732a44f8c1c0 100644 --- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml +++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/WizardStep.xml @@ -51,7 +51,7 @@ <li> <span class="btn btn-xs number$extraClassName"> #if ($stepNumber > $index) - &${escapetool.h}10004; + $services.icon.renderHTML('check') #else $index #end diff --git a/xwiki-platform-core/xwiki-platform-attachment/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/pom.xml index 05ff35d4fe6a..c5c2b8aeffe3 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment XWiki Platform - Attachment - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml index bb7194abf186..7facc08ab7e5 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-api XWiki Platform - Attachment - API diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml index 16d70adead07..ba90fc21e332 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-picker XWiki Platform - Attachment - Picker - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml index 6e21512deac7..ac2bf7db5188 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-picker - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT jar xwiki-platform-attachment-picker-macro diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties index 98f9902031ec..453e315bbbee 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/src/main/resources/ApplicationResources_fr.properties @@ -27,4 +27,5 @@ rendering.macro.attachmentGalleryPicker.parameter.filter.description=Une liste d rendering.macro.attachmentGalleryPicker.parameter.limit.name=Limite rendering.macro.attachmentGalleryPicker.parameter.limit.description=Le nombre maximum de pi\u00E8ces jointes \u00E0 afficher attachment.picker.macro.notResult.message=Aucun r\u00E9sultat. +attachment.picker.macro.globalSelection.message=La pi\u00E8ce jointe s\u00E9lectionn\u00E9e ne fait pas partie du document courant. attachment.picker.solrSearch.query.errorMessage=La requ\u00EAte de recherche des pi\u00E8ces jointes a \u00E9chou\u00E9. diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml index 7f3dfd641bf8..fe1d757be4f4 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-picker - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-picker-test XWiki Platform - Attachment - Picker - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml index 60698ea2bdbe..6d64147f6f86 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-picker-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-picker-test-docker XWiki Platform - Attachment - Picker - Tests - Functional Tests in Docker diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml index 30e1c328106f..15daea9364d7 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-picker-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-picker-test-pageobjects XWiki Platform - Attachment - Picker - Tests - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml index 88a7a0163756..8d95bd7559ce 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-picker - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-picker-ui XWiki Platform - Attachment - Picker - UI diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml index 85efe2eaadbb..8e27c043fff3 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.fr.xml @@ -38,5 +38,7 @@ true attachment.picker.ckeditor.pluginsImageSelector.title=Galerie attachment.picker.searchField.placeholder=Recherche... +attachment.picker.searchField.scope.currentPage=Page Courante +attachment.picker.searchField.scope.allPages=Toutes les Pages diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml index 0bf0292237d4..500aa6b1ad59 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-picker - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT webjar xwiki-platform-attachment-picker-webjar diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml index 8f4feaaee529..5034b4edbe5c 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-test XWiki Platform - Attachment - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml index 57c1ad60d8db..10c402a8b2fc 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-test-docker XWiki Platform - Attachment - Tests - Functional Tests in Docker diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml index 28ae6d5cff52..e86ff137eff9 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-test-pageobjects XWiki Platform - Attachment - Tests - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml index 2f21c36a6745..fa3df41180b2 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-ui XWiki Platform - Attachment - UI diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml index fb96cfb9a096..b405eea34757 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation XWiki Platform - Attachment - Validation - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml index e1eb45a54905..2daf1484667f 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-validation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation-api XWiki Platform - Attachment - Validation - API diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml index f2376926da2e..06b871d3f5dc 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-validation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation-default XWiki Platform - Attachment - Validation - Default diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml index edba333dd615..345928ac5ad6 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-validation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation-test XWiki Platform - Attachment - Validation - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml index 281e008c4656..20576d9c2e73 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-validation-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation-test-docker XWiki Platform - Attachment - Validation - Tests - Functional Tests in Docker diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml index 3e786e4d9f06..f0d8153e2b4e 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-validation-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation-test-pageobjects XWiki Platform - Attachment - Validation - Tests - Page Objects diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml index eb7625225776..99d128742234 100644 --- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-attachment-validation - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-attachment-validation-ui XWiki Platform - Attachment - Validation - UI diff --git a/xwiki-platform-core/xwiki-platform-bridge/pom.xml b/xwiki-platform-core/xwiki-platform-bridge/pom.xml index 1ec0a5097834..fcbcfb259f8d 100644 --- a/xwiki-platform-core/xwiki-platform-bridge/pom.xml +++ b/xwiki-platform-core/xwiki-platform-bridge/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-bridge XWiki Platform - Bridge diff --git a/xwiki-platform-core/xwiki-platform-captcha/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/pom.xml index 14c0b04d743b..5dbfc0572262 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha XWiki Platform - CAPTCHA - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml index b6f3289b26b1..8c5df9a7f529 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-captcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha-api XWiki Platform - CAPTCHA - API diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml index a119789e90b0..38159faa5518 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-captcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha-default XWiki Platform - CAPTCHA - Default Implementation diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml index 9b11961e1355..4c0769b85bce 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-captcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha-jcaptcha XWiki Platform - CAPTCHA - JCaptcha - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml index 61cbf6f2ddcb..4c9d0d83202e 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-captcha-jcaptcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha-jcaptcha-api XWiki Platform - CAPTCHA - JCaptcha - API diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml index 8df6728f70f0..e551ef751aa0 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-captcha-jcaptcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha-jcaptcha-ui xar diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml index b1f817956019..db00c335066c 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-captcha-jcaptcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT webjar xwiki-platform-captcha-jcaptcha-webjar diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml index 4fd901ca1f18..b470ddb7a362 100644 --- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml +++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-captcha - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-captcha-ui xar diff --git a/xwiki-platform-core/xwiki-platform-chart/pom.xml b/xwiki-platform-core/xwiki-platform-chart/pom.xml index b659d46b941a..dc5648fa7d25 100644 --- a/xwiki-platform-core/xwiki-platform-chart/pom.xml +++ b/xwiki-platform-core/xwiki-platform-chart/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-chart pom diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml index 2b8bcdd39ca2..3cad312a9878 100644 --- a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml +++ b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-rendering-macros - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT ../../xwiki-platform-rendering/xwiki-platform-rendering-macros xwiki-platform-chart-macro diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml index fe6cb42e8f72..a221701a067c 100644 --- a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml +++ b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml @@ -23,7 +23,7 @@ org.xwiki.platform xwiki-platform-chart - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-chart-renderer XWiki Platform - Chart - Rendering diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml index af01402e264a..7c9c43b2dfce 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-core - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-ckeditor pom diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml index 83419c6a495f..a670b473dbfa 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-ckeditor - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT webjar xwiki-platform-ckeditor-plugins @@ -34,6 +34,8 @@ CKEditor Plugins for XWiki + + org.xwiki.contrib:application-ckeditor-plugins org.xwiki.contrib:application-ckeditor-plugins diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js index 9d33e3615ef1..a9f476f596a2 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js @@ -26,6 +26,7 @@ *
  • submits only the significant content
    • *
  • converts the font tags into span tags
    • *
  • unprotect allowed scripts
    • + *
  • escapes the content of style tags to avoid breaking the HTML parser
    • * * * @see http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Data_Processor @@ -162,6 +163,12 @@ htmlFilter.addRules(submitOnlySignificantContent, {priority: 5, applyToAll: true}); } + // We have to filter both the input HTML (toHtml) and the output HTML (toDataFormat) because the CKEditor HTML + // parser is called in both cases. Priority 1 is needed to ensure our listener is called before the HTML parser + // (which has priority 5). + editor.on('toHtml', escapeStyleContent, null, null, 1); + editor.on('toDataFormat', escapeStyleContent, null, null, 1); + // Transform into . // See https://ckeditor.com/old//comment/125305#comment-125305 editor.filter.addTransformations([ @@ -310,4 +317,31 @@ } } }); + + const domParser = new DOMParser(); + function escapeStyleContent(event) { + let html = event.data.dataValue; + // Depending on the editor type (inline or iframe-based) and configuration (fullPage true or false) the HTML + // string can be a full HTML document or just a fragment (e.g. the content of the BODY tag). + const isFragment = !html.trimEnd().endsWith(''); + try { + const doc = domParser.parseFromString(html, 'text/html'); + // We want to modify the input HTML string only if there is a style tag that need escaping. + let modified = false; + doc.querySelectorAll('style').forEach(style => { + const styleContent = style.textContent; + // Escaping the '<' (less than) character in the style content is normally not required but unfortunately + // CKEditor's HTML parser relies heavily on regular expressions to match the start / end tags and considers + // the '<' character as the start of a new tag, even when '<' is used inside CSS (e.g. with the content + // property). See https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser.html + style.textContent = styleContent.replaceAll('<', '\\3C'); + modified = modified || (styleContent !== style.textContent); + }); + if (modified) { + event.data.dataValue = isFragment ? doc.body.innerHTML : doc.documentElement.outerHTML; + } + } catch (e) { + console.warn('Failed to escape the style tags from the given HTML string: ' + html, e); + } + } })(); diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js index 68e89e1ccdee..3f5e79df6548 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-focusedplaceholder/plugin.js @@ -149,8 +149,8 @@ * @return the element that holds the caret and is empty, or undefined if no such element is present */ function getFocusedEmptyBlock(editor) { - const selection = editor.getSelection(); - if (selection?.isCollapsed() && editor.focusManager.hasFocus) { + const selection = !editor.isDetached() && editor.getSelection(); + if (selection?.isCollapsed?.() && editor.focusManager.hasFocus) { const container = selection.getRanges()[0].startContainer; // Check first if the container itself is empty, in order to reduce the computations, since this method is // called whenever the user types (and most of the time the caret is inside a text node that is not empty). diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js index 0b81347d379a..b4be81a5023a 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js @@ -655,6 +655,8 @@ }, insertOrUpdateMacroWidget: function(editor, data, widget, skipRefresh) { + // Save the editor state before inserting the macro in order to be able to undo the macro insertion. + editor.fire('saveSnapshot'); // Prevent the editor from recording Undo/Redo history entries while the edited content is being refreshed: // * if the macro is inserted then we need to wait for the macro markers to be replaced by the actual macro output // * if the macro is updated then we need to wait for the macro output to be updated to match the new macro data @@ -706,9 +708,15 @@ // Clean up the inline enforcer to avoid duplicates for the next inline macro insertion. inlineEnforcer.remove(); } - editor.fire('unlockSnapshot'); + this.waitForWidgetsToBeReady(editor).then(() => { + editor.fire('unlockSnapshot'); + // Save the editor state after the macro widget is inserted and initialized in order to be able to redo the + // macro insertion. This also triggers the 'change' event allowing others to react to the macro insertion + // (e.g. the real-time editing can propagate this change). + editor.fire('saveSnapshot'); + }); } - }); + }, this); if (skipRefresh) { return; @@ -730,6 +738,15 @@ editor.widgets.finalizeCreation(documentFragment); }, + waitForWidgetsToBeReady: function(editor) { + const widgetsNotReady = Object.values(editor.widgets.instances).filter(widget => !widget.ready); + if (widgetsNotReady.length) { + return Promise.all(widgetsNotReady.map(widget => new Promise(resolve => widget.once('ready', resolve)))); + } else { + return Promise.resolve(); + } + }, + maybeRegisterDedicatedInsertMacroButton: function(editor, definition) { if (definition) { if (typeof definition === 'string') { diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js index 2f665a1252c1..79284e809fd7 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js @@ -82,7 +82,7 @@ // reset the dirty flag and the moment we leave the edit mode, which will trigger the leave confirmation, // unexpectedly. In order to overcome this we have to force the editor to lose focus immediately if the // focus manager has a blur timer started (meaning that a blur is scheduled). - if (editor.focusManager?.hasFocus && editor.focusManager?._?.timer) { + if (!editor.isDetached() && editor.focusManager?.hasFocus && editor.focusManager?._?.timer) { editor.focusManager.blur(true); } editor.resetDirty(); diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml index 02b1774c7d9c..3c89ee513a78 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-ckeditor - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-ckeditor-test XWiki Platform - CKEditor - Tests - Parent POM diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml index 95056ec928d9..7addaecf0df2 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml @@ -25,7 +25,7 @@ org.xwiki.platform xwiki-platform-ckeditor-test - 16.0.0-SNAPSHOT + 16.1.0-SNAPSHOT xwiki-platform-ckeditor-test-docker XWiki Platform - CKEditor - Tests - Docker diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java index 2f5379a3189e..40a776b7190e 100644 --- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/AllIT.java @@ -39,20 +39,20 @@ class NestedSaveIT extends SaveIT } @Nested - @DisplayName("Image Plugin") - class NestedImagePluginIT extends ImagePluginIT + @DisplayName("Image") + class NestedImageIT extends ImageIT { } @Nested - @DisplayName("TextArea Editor") + @DisplayName("TextArea Property Editor") class NestedTextAreaIT extends TextAreaIT { } @Nested - @DisplayName("Link Plugin") - class NestedLinkPluginIT extends LinkPluginIT + @DisplayName("Link") + class NestedLinkIT extends LinkIT { } @@ -73,5 +73,10 @@ class NestedUndoRedoIT extends UndoRedoIT class NestedLocalizationIT extends LocalizationIT { } - + + @Nested + @DisplayName("Filter") + class NestedFilterIT extends FilterIT + { + } } diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java new file mode 100644 index 000000000000..9f10536110a0 --- /dev/null +++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/FilterIT.java @@ -0,0 +1,84 @@ +/* + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.xwiki.ckeditor.test.ui; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.xwiki.test.docker.junit5.TestReference; +import org.xwiki.test.docker.junit5.UITest; +import org.xwiki.test.ui.TestUtils; + +/** + * Tests how CKEditor filters the content. + * + * @version $Id$ + */ +@UITest +class FilterIT extends AbstractCKEditorIT +{ + @BeforeEach + void beforeEach(TestUtils setup, TestReference testReference) + { + edit(setup, testReference); + } + + @AfterEach + void afterEach(TestUtils setup, TestReference testReference) + { + maybeLeaveEditMode(setup, testReference); + } + + @Test + @Order(1) + void escapeStyleContent() + { + StringBuilder source = new StringBuilder(); + source.append("before\n"); + source.append("\n"); + source.append("{{html clean=\"false\"}}\n"); + source.append("\n"); + source.append("
    inside
    \n"); + source.append("\n"); + source.append("{{/html}}\n"); + source.append("\n"); + source.append("after"); + + setSource(source.toString()); + String html = this.textArea.getContent(); + assertTrue(html.contains(" + \ No newline at end of file diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js index df76cf30875e..b983c620db74 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/directives.js @@ -50,7 +50,6 @@ export const mousedownmove = { const removeMousemoveHandler = () => { window.removeEventListener("mousemove", mousemoveHandler); window.removeEventListener("mouseup", removeMousemoveHandler); - window.removeEventListener("focusout", removeMousemoveHandler); }; // If the "immediate" modifiers is set, dispatch the event immediately @@ -61,7 +60,6 @@ export const mousedownmove = { // Bind event listeners window.addEventListener("mousemove", mousemoveHandler); window.addEventListener("mouseup", removeMousemoveHandler); - window.addEventListener("focusout", removeMousemoveHandler); }); } }; diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue index e8ce19903959..01dcef9ca7ee 100644 --- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue +++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/layouts/LivedataLayout.vue @@ -34,6 +34,9 @@ -->