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

1e8d4651

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

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/webapp/scripts/xnat/url.js

parents 8812b539 0543ad44

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/nrg/xnat/initialization/RootConfig.java 10 additions, 9 deletions

src/main/java/org/nrg/xnat/initialization/RootConfig.java
src/main/java/org/nrg/xnat/restlet/resources/PARList.java 16 additions, 20 deletions

src/main/java/org/nrg/xnat/restlet/resources/PARList.java
src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java 2 additions, 1 deletion

...n/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java 2 additions, 1 deletion

...security/provider/XnatDatabaseAuthenticationProvider.java
src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml 33 additions, 12 deletions

.../resources/META-INF/xnat/spawner/site-admin-elements.yaml
src/main/webapp/scripts/xmodal-v1/xmodal.css 61 additions, 64 deletions

src/main/webapp/scripts/xmodal-v1/xmodal.css
src/main/webapp/scripts/xnat/ui/panel.js 1 addition, 1 deletion

src/main/webapp/scripts/xnat/ui/panel.js
src/main/webapp/scripts/xnat/url.js 1 addition, 1 deletion

src/main/webapp/scripts/xnat/url.js

with 126 additions and 109 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