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

0f3a5e42

Commit 0f3a5e42 authored 8 years ago by Justin Cleveland

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into HEAD

parents 5583a9ae baffcf11

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java 1 addition, 1 deletion

src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java
src/main/java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java 4 additions, 5 deletions

...java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java
src/main/java/org/nrg/xnat/security/alias/AliasTokenAuthenticationProvider.java 1 addition, 1 deletion

...xnat/security/alias/AliasTokenAuthenticationProvider.java
src/main/java/org/nrg/xnat/security/alias/AliasTokenAuthenticationToken.java 3 additions, 3 deletions

...rg/xnat/security/alias/AliasTokenAuthenticationToken.java
src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java 1 addition, 1 deletion

...org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java 1 addition, 1 deletion

...g/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java

with 11 additions and 12 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