Skip to content
Snippets Groups Projects
  1. Apr 12, 2016
    • Rick Herrick's avatar
      Added support for initializing site URL from request URL and servlet context.... · 64e14396
      Rick Herrick authored
      Added support for initializing site URL from request URL and servlet context. Finished StringUtils migration. Added XapiRestController handling.
      64e14396
    • Rick Herrick's avatar
      Merged changes from Tim's plugin development with latest main line development. · be69df94
      Rick Herrick authored
      Merge commit '37317f9f'
      
      # Conflicts:
      #	.gitignore
      #	build.gradle
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseries.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatImageassessordata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatImagesessiondata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatPublicationresource.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatPvisitdata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedata.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatResource.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatResourcecatalog.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatResourceseries.java
      #	src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdata.java
      be69df94
  2. Apr 11, 2016
  3. Apr 10, 2016
  4. Apr 08, 2016
    • Mark M. Florida's avatar
      · 8563e483
      Mark M. Florida authored
      Fixed function name.
      8563e483
  5. Apr 04, 2016
  6. Mar 30, 2016
  7. Mar 29, 2016
  8. Mar 28, 2016
  9. Mar 27, 2016
  10. Mar 24, 2016
  11. Mar 22, 2016
  12. Mar 21, 2016
  13. Mar 19, 2016
  14. Mar 18, 2016
  15. Mar 17, 2016
  16. Mar 16, 2016
  17. Mar 15, 2016
  18. Mar 09, 2016
  19. Mar 07, 2016
    • Rick Herrick's avatar
      Moved SwaggerConfig operations into WebConfig and fixed paths on Swagger... · f22a4ea0
      Rick Herrick authored
      Moved SwaggerConfig operations into WebConfig and fixed paths on Swagger resource handlers. Moved UsersApi and related classes into users subpackage. Fixed timeout cookie. Moved InstanceSettings.xml to InstanceSettings.xml.sample and put InstanceSettings.xml into the .gitignore file. Updated some dependency versions.
      f22a4ea0
  20. Mar 05, 2016
  21. Mar 02, 2016
  22. Feb 29, 2016
  23. Feb 28, 2016
  24. Feb 26, 2016
  25. Feb 24, 2016
  26. Feb 23, 2016
Loading