-
- Downloads
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
Showing
- src/main/java/org/nrg/xnat/event/listeners/AutomationEventScriptHandler.java 6 additions, 2 deletions...rg/xnat/event/listeners/AutomationEventScriptHandler.java
- src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java 23 additions, 9 deletions.../java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
- src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java 4 additions, 2 deletions...org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
- src/main/java/org/nrg/xnat/turbine/modules/actions/PlexiViewerSpec.java 0 additions, 32 deletions...org/nrg/xnat/turbine/modules/actions/PlexiViewerSpec.java
- src/main/java/org/nrg/xnat/turbine/modules/actions/ShowViewerAction.java 0 additions, 120 deletions...rg/nrg/xnat/turbine/modules/actions/ShowViewerAction.java
- src/main/java/org/nrg/xnat/turbine/modules/screens/Login.java 1 addition, 1 deletion...main/java/org/nrg/xnat/turbine/modules/screens/Login.java
- src/main/java/org/nrg/xnat/turbine/modules/screens/Viewer.java 0 additions, 86 deletions...ain/java/org/nrg/xnat/turbine/modules/screens/Viewer.java
- src/main/java/org/nrg/xnat/turbine/modules/screens/ViewerHelp.java 0 additions, 26 deletions...java/org/nrg/xnat/turbine/modules/screens/ViewerHelp.java
- src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_themes.java 0 additions, 24 deletions...g/nrg/xnat/turbine/modules/screens/XDATScreen_themes.java
- src/main/resources/META-INF/xnat/init_security_000.sql 0 additions, 60 deletionssrc/main/resources/META-INF/xnat/init_security_000.sql
- src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml 8 additions, 2 deletions.../resources/META-INF/xnat/spawner/site-admin-elements.yaml
- src/main/resources/config/features/xnat-feature-definition.properties 0 additions, 7 deletions...ources/config/features/xnat-feature-definition.properties
- src/main/webapp/PlexiViewerSpec.xml 0 additions, 159 deletionssrc/main/webapp/PlexiViewerSpec.xml
- src/main/webapp/WEB-INF/tags/page/xnat.tag 3 additions, 2 deletionssrc/main/webapp/WEB-INF/tags/page/xnat.tag
- src/main/webapp/WEB-INF/tags/spawner/layout.tag 1 addition, 1 deletionsrc/main/webapp/WEB-INF/tags/spawner/layout.tag
- src/main/webapp/applet/DicomEdit-4.0.0.jar.pack.gz 0 additions, 0 deletionssrc/main/webapp/applet/DicomEdit-4.0.0.jar.pack.gz
- src/main/webapp/applet/DicomEdit__V4.0.0.jar 0 additions, 0 deletionssrc/main/webapp/applet/DicomEdit__V4.0.0.jar
- src/main/webapp/applet/DicomEdit__V4.0.0.jar.pack.gz 0 additions, 0 deletionssrc/main/webapp/applet/DicomEdit__V4.0.0.jar.pack.gz
- src/main/webapp/applet/DicomUtils-1.3.1.jar.pack.gz 0 additions, 0 deletionssrc/main/webapp/applet/DicomUtils-1.3.1.jar.pack.gz
- src/main/webapp/applet/DicomUtils__V1.3.1.jar 0 additions, 0 deletionssrc/main/webapp/applet/DicomUtils__V1.3.1.jar
Loading
Please register or sign in to comment