Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

X

xnat-web
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

1c2a5b94

Commit 1c2a5b94 authored 8 years ago by Mark M. Florida

Downloads
- Plain Diff

Merge branch 'master' of https://bitbucket.org/xnatdev/xnat-web

parents 2201540d 2b53b2e6

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

build.gradle 2 additions, 2 deletions

build.gradle
gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletions

gradle/wrapper/gradle-wrapper.properties
src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java 2 additions, 2 deletions

src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java
src/main/java/org/nrg/xapi/rest/notifications/NotificationsApi.java 2 additions, 2 deletions

...ava/org/nrg/xapi/rest/notifications/NotificationsApi.java
src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java 2 additions, 2 deletions

src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java
src/main/java/org/nrg/xapi/rest/users/UsersApi.java 2 additions, 2 deletions

src/main/java/org/nrg/xapi/rest/users/UsersApi.java
src/main/java/org/nrg/xnat/restlet/resources/search/SavedSearchResource.java 345 additions, 363 deletions

...rg/xnat/restlet/resources/search/SavedSearchResource.java
src/main/java/org/nrg/xnat/restlet/resources/search/SearchResource.java 385 additions, 409 deletions

...org/nrg/xnat/restlet/resources/search/SearchResource.java

with 742 additions and 784 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment