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

c3facc5c

Commit c3facc5c authored 8 years ago by Mark M. Florida

Downloads
- Plain Diff

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

parents 8ca4266e 2bad0a1e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/nrg/xnat/initialization/DatabaseConfig.java 30 additions, 5 deletions

...main/java/org/nrg/xnat/initialization/DatabaseConfig.java
src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml 7 additions, 7 deletions

.../resources/META-INF/xnat/spawner/site-admin-elements.yaml
src/main/webapp/WEB-INF/conf/xnat-conf.properties 0 additions, 3 deletions

src/main/webapp/WEB-INF/conf/xnat-conf.properties
src/main/webapp/WEB-INF/conf/xnat-security.xml 1 addition, 2 deletions

src/main/webapp/WEB-INF/conf/xnat-security.xml
src/main/webapp/page/admin/data/config/site-setup.yaml 2 additions, 2 deletions

src/main/webapp/page/admin/data/config/site-setup.yaml

with 40 additions and 19 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