Commit c8381afa authored 10 years ago by Guillaume Delhumeau

Merge branch 'master' into feature-less4j

Conflicts:
xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/compiler/CachedIntegratedLESSCompiler.java
xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm

parents 4a5a31c0 853eac48

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 24 additions, 0 deletions

pom.xml
xwiki-platform-core/pom.xml 52 additions, 8 deletions

xwiki-platform-core/pom.xml
xwiki-platform-core/xwiki-platform-activeinstalls/xwiki-platform-activeinstalls-server/xwiki-platform-activeinstalls-server-ui/src/main/resources/ActiveInstalls/ActiveInstallsHistoryData.xml 5 additions, 2 deletions

...in/resources/ActiveInstalls/ActiveInstallsHistoryData.xml
xwiki-platform-core/xwiki-platform-activeinstalls/xwiki-platform-activeinstalls-test/xwiki-platform-activeinstalls-test-tests/pom.xml 2 additions, 0 deletions

...lls-test/xwiki-platform-activeinstalls-test-tests/pom.xml
xwiki-platform-core/xwiki-platform-activeinstalls/xwiki-platform-activeinstalls-test/xwiki-platform-activeinstalls-test-tests/src/test/it/org/xwiki/activeinstalls/test/ui/ActiveInstallsTest.java 1 addition, 1 deletion

.../org/xwiki/activeinstalls/test/ui/ActiveInstallsTest.java
xwiki-platform-core/xwiki-platform-activitystream/xwiki-platform-activitystream-api/src/main/java/com/xpn/xwiki/plugin/activitystream/impl/ActivityStreamCleaner.java 1 addition, 1 deletion

...iki/plugin/activitystream/impl/ActivityStreamCleaner.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/AdministrationPage.java 20 additions, 5 deletions

.../org/xwiki/administration/test/po/AdministrationPage.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/GlobalRightsAdministrationSectionPage.java 5 additions, 5 deletions

...ration/test/po/GlobalRightsAdministrationSectionPage.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/ImportAdministrationSectionPage.java 6 additions, 5 deletions

...ministration/test/po/ImportAdministrationSectionPage.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/LightBoxRegistrationPage.java 1 addition, 1 deletion

...wiki/administration/test/po/LightBoxRegistrationPage.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/ResetPasswordCompletePage.java 105 additions, 0 deletions

...iki/administration/test/po/ResetPasswordCompletePage.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/ResetPasswordPage.java 86 additions, 0 deletions

...a/org/xwiki/administration/test/po/ResetPasswordPage.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-tests/pom.xml 32 additions, 0 deletions

...ion-test/xwiki-platform-administration-test-tests/pom.xml
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-tests/src/test/it/org/xwiki/administration/test/ui/AdministrationTest.java 2 additions, 2 deletions

.../org/xwiki/administration/test/ui/AdministrationTest.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-tests/src/test/it/org/xwiki/administration/test/ui/ImportTest.java 1 addition, 1 deletion

.../test/it/org/xwiki/administration/test/ui/ImportTest.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-tests/src/test/it/org/xwiki/administration/test/ui/ResetPasswordTest.java 223 additions, 0 deletions

...t/org/xwiki/administration/test/ui/ResetPasswordTest.java
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminSheet.xml 1 addition, 1 deletion

...administration-ui/src/main/resources/XWiki/AdminSheet.xml
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ResetPasswordComplete.xml 162 additions, 163 deletions

...ion-ui/src/main/resources/XWiki/ResetPasswordComplete.xml
xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/XWikiGroupSheet.xml 75 additions, 79 deletions

...istration-ui/src/main/resources/XWiki/XWikiGroupSheet.xml
xwiki-platform-core/xwiki-platform-annotations/xwiki-platform-annotation-core/pom.xml 4 additions, 0 deletions

...atform-annotations/xwiki-platform-annotation-core/pom.xml

with 808 additions and 274 deletions

Please register or to comment