Merge branch 'master' into develop
Conflicts: src/main/webapp/xnat-templates/screens/Login.vm src/main/webapp/xnat-templates/screens/Register.vm
No related branches found
No related tags found
Showing
- build.gradle 6 additions, 6 deletionsbuild.gradle
- src/main/java/org/nrg/dcm/id/ClassicDicomObjectIdentifier.java 12 additions, 24 deletions...ain/java/org/nrg/dcm/id/ClassicDicomObjectIdentifier.java
- src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java 8 additions, 28 deletionssrc/main/java/org/nrg/pipeline/XnatPipelineLauncher.java
- src/main/java/org/nrg/viewer/QCImageCreator.java 1 addition, 1 deletionsrc/main/java/org/nrg/viewer/QCImageCreator.java
- src/main/java/org/nrg/xapi/exceptions/InsufficientPrivilegesException.java 25 additions, 0 deletions.../nrg/xapi/exceptions/InsufficientPrivilegesException.java
- src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java 24 additions, 0 deletions...main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
- src/main/java/org/nrg/xapi/rest/data/CatalogApi.java 74 additions, 0 deletionssrc/main/java/org/nrg/xapi/rest/data/CatalogApi.java
- src/main/java/org/nrg/xapi/rest/notifications/NotificationsApi.java 165 additions, 220 deletions...ava/org/nrg/xapi/rest/notifications/NotificationsApi.java
- src/main/java/org/nrg/xapi/rest/settings/PreferencesApi.java 117 additions, 0 deletionssrc/main/java/org/nrg/xapi/rest/settings/PreferencesApi.java
- src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java 37 additions, 19 deletionssrc/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
- src/main/java/org/nrg/xapi/rest/users/UsersApi.java 13 additions, 3 deletionssrc/main/java/org/nrg/xapi/rest/users/UsersApi.java
- src/main/java/org/nrg/xnat/archive/Transfer.java 1 addition, 1 deletionsrc/main/java/org/nrg/xnat/archive/Transfer.java
- src/main/java/org/nrg/xnat/configuration/ApplicationConfig.java 3 additions, 3 deletions...in/java/org/nrg/xnat/configuration/ApplicationConfig.java
- src/main/java/org/nrg/xnat/configuration/NotificationsConfig.java 9 additions, 13 deletions.../java/org/nrg/xnat/configuration/NotificationsConfig.java
- src/main/java/org/nrg/xnat/configuration/PreferencesConfig.java 0 additions, 27 deletions...in/java/org/nrg/xnat/configuration/PreferencesConfig.java
- src/main/java/org/nrg/xnat/configuration/SchedulerConfig.java 3 additions, 3 deletions...main/java/org/nrg/xnat/configuration/SchedulerConfig.java
- src/main/java/org/nrg/xnat/configuration/XnatServicesConfig.java 21 additions, 0 deletions...n/java/org/nrg/xnat/configuration/XnatServicesConfig.java
- src/main/java/org/nrg/xnat/event/listeners/SiteConfigPreferenceHandler.java 27 additions, 33 deletions...nrg/xnat/event/listeners/SiteConfigPreferenceHandler.java
- src/main/java/org/nrg/xnat/event/listeners/methods/AbstractNotificationsPreferenceHandlerMethod.java 2 additions, 2 deletions...methods/AbstractNotificationsPreferenceHandlerMethod.java
- src/main/java/org/nrg/xnat/event/listeners/methods/AbstractSiteConfigNotificationsPreferenceHandlerMethod.java 2 additions, 2 deletions...stractSiteConfigNotificationsPreferenceHandlerMethod.java
Loading
Please register or sign in to comment