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

72f18577

Commit 72f18577 authored 8 years ago by Mike McKay

Downloads
- Plain Diff

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

parents acc20f55 af4872b1

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/nrg/xapi/rest/data/InvestigatorsApi.java 207 additions, 0 deletions

src/main/java/org/nrg/xapi/rest/data/InvestigatorsApi.java
src/main/webapp/xdat-templates/navigations/NoMenuTop.vm 1 addition, 1 deletion

src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm 1 addition, 1 deletion

...in/webapp/xdat-templates/navigations/NoninteractiveTop.vm
src/main/webapp/xnat-templates/navigations/DefaultTop.vm 1 addition, 1 deletion

src/main/webapp/xnat-templates/navigations/DefaultTop.vm

with 210 additions and 3 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