clowder

• 

  Jim Myers 20 Sep 2018 9d15d2989339077c670194c940d58a94e062036b

  missing </div> before right column

  • app/views/dataset.scala.html (version 9d15d2989339077c670194c940d58a94e062036b) (diffs)
  • app/views/file.scala.html (version 9d15d2989339077c670194c940d58a94e062036b) (diffs)
• 

  Jim Myers 20 Sep 2018 79d5d92f8ab51c2cdf18026421f1800106ea4846

  support for adding multiple comma separated tags

  • app/views/datasets/tags.scala.html (version 79d5d92f8ab51c2cdf18026421f1800106ea4846) (diffs)
  • app/views/file.scala.html (version 79d5d92f8ab51c2cdf18026421f1800106ea4846) (diffs)
• 

  Jim Myers 19 Sep 2018 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2

  merge issues

  • app/api/Metadata.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/controllers/CurationObjects.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/controllers/Datasets.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/controllers/Files.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/services/MetadataService.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/services/RabbitmqPlugin.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
  • app/views/dataset.scala.html (version 3d090e6aa3cb7022b958eda9b23b08c7f4c4bdb2) (diffs)
• 

  Jim Myers 19 Sep 2018 5e5abae603c5b2bb5e6e50cdba5258e98cbd71f3

  Merge branch 'develop' into feature/editable-metadata
  Conflicts:
          CHANGELOG.md
          app/api/CurationObjects.scala
          app/api/Datasets.scala
          app/api/Extractions.scala
          app/api/Files.scala
          app/api/Folders.scala
          app/api/Indexes.scala
          app/api/Metadata.scala
          app/controllers/CurationObjects.scala
          app/controllers/Datasets.scala
          app/controllers/Files.scala
          app/models/Collection.scala
          app/services/MetadataService.scala
          app/services/mongodb/MongoDBDatasetService.scala
          app/services/mongodb/MongoDBMetadataService.scala
          app/services/mongodb/MongoSalatPlugin.scala
          app/util/SearchUtils.scala
          conf/routes
• 

  Luigi Marini 12 Sep 2018 067c874eb2578fc475c50aa216b88108fc46ee9a m

  Fixed bug where extractors wouldn't properly fire when using old rabbitmq bindings.

  • CHANGELOG.md (version 067c874eb2578fc475c50aa216b88108fc46ee9a) (diffs)
  • app/services/RabbitmqPlugin.scala (version 067c874eb2578fc475c50aa216b88108fc46ee9a) (diffs)
• 

  Luigi Marini 12 Sep 2018 8e7e14671bdb88aee22bc7e5f52c1641e0a3f523 m

  Merge pull request #1278 in CATS/clowder from bugfix/CATS-921-space-role-editor-has-the-wrong-default-permissions to develop
  * commit '383db1ae3c75baac7d1472f05241b8594eb69b62':
    Fixed Permissions for Editor Role.
• 

  Indira Gutierrez Polo 12 Sep 2018 383db1ae3c75baac7d1472f05241b8594eb69b62 m

  Fixed Permissions for Editor Role.

  • CHANGELOG.md (version 383db1ae3c75baac7d1472f05241b8594eb69b62) (diffs)
  • app/api/Permissions.scala (version 383db1ae3c75baac7d1472f05241b8594eb69b62) (diffs)
  • app/models/Role.scala (version 383db1ae3c75baac7d1472f05241b8594eb69b62) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version 383db1ae3c75baac7d1472f05241b8594eb69b62) (diffs)
• 

  Luigi Marini 12 Sep 2018 42e266e9dcdb2446d2da112131a9e96b7bdf2baa m

  Merge pull request #1277 in CATS/clowder from feature/CATS-919-accept-user-api-key-in-the-header to develop
  * commit 'a0e060da5477bde3942038aeb2c8ce0238d4e6e9':
    Accept user API key as X-API-key HTTP request header.
• 

  Yan Zhao 11 Sep 2018 a0e060da5477bde3942038aeb2c8ce0238d4e6e9 m

  Accept user API key as X-API-key HTTP request header.

  • CHANGELOG.md (version a0e060da5477bde3942038aeb2c8ce0238d4e6e9) (diffs)
  • app/api/ApiController.scala (version a0e060da5477bde3942038aeb2c8ce0238d4e6e9) (diffs)
• 

  Luigi Marini 29 Aug 2018 2935f0bd9a7a78d427facca447c07ad8c27f4e8a m

  Fixed error with GravatarUtils being passed into plugins as second argument using dependency injection. Plugins can only have one argument.

  • app/controllers/Registration.scala (version 2935f0bd9a7a78d427facca447c07ad8c27f4e8a) (diffs)
  • app/services/CrowdProvider.scala (version 2935f0bd9a7a78d427facca447c07ad8c27f4e8a) (diffs)
  • app/services/LdapProvider.scala (version 2935f0bd9a7a78d427facca447c07ad8c27f4e8a) (diffs)
  • app/util/GravatarUtils.scala (version 2935f0bd9a7a78d427facca447c07ad8c27f4e8a) (diffs)
• 

  Luigi Marini 29 Aug 2018 1607a0f5255f77ba634967c73ee9fe5a5281e8c4 m

  Merge pull request #1247 in CATS/clowder from feature/CATS-882-update-gravatar-to-https to develop
  * commit '0863a55c708d09526711703bc0fd4b25a2864e3d':
    Updated gravatar links from http to https. Added mongo salat update script for target user in events. Movied code for generating gravatar to util/GravatarUtils. Using it in Registration, CrowdProvider and LdapProvider.
• 

  Indira Gutierrez Polo 29 Aug 2018 0863a55c708d09526711703bc0fd4b25a2864e3d m

  Updated gravatar links from http to https. Added mongo salat update script for target user in events. Movied code for generating gravatar to util/GravatarUtils. Using it in Registration, CrowdProvider and LdapProvider.

  • CHANGELOG.md (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
  • app/controllers/Login.scala (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
  • app/controllers/Registration.scala (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
  • app/services/CrowdProvider.scala (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
  • app/services/LdapProvider.scala (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
  • app/util/GravatarUtils.scala (version 0863a55c708d09526711703bc0fd4b25a2864e3d) (diffs)
• 

  Max Burnette <mburnet2@illinois.com> 29 Aug 2018 d3f3f1d4bfcf974401074243d6aa0209be72b33e m

  Added tracking of view and download counts for Files, Datasets and Collections. [CATS-374][CATS-375]

  • CHANGELOG.md (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/api/Collections.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/api/Datasets.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/api/Files.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/controllers/Collections.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/controllers/Datasets.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/controllers/Files.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/models/Collection.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/models/Dataset.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/models/File.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/models/Statistic.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/services/CollectionService.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/services/DatasetService.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/services/FileService.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/util/FileUtils.scala (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/collectionofdatasets.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/collections/tile.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/dataset.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/datasets/tile.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/file.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/files/listitem.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • app/views/files/tile.scala.html (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
  • conf/routes (version d3f3f1d4bfcf974401074243d6aa0209be72b33e) (diffs)
• 

  Bing Zhang 21 Aug 2018 4cfd22deb05aceec5edd6e16d7d631a21fa9baef m

  In DatasetService, rename previous findByFileID function to findByFileIdDirectlyContain. Refactor the code for this renaming. Add a new function findByFileIdAllContain to return back datasets directly and indirectly contain the given file.

  • CHANGELOG.md (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/api/Datasets.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/api/Extractions.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/api/Files.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/api/Permissions.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/controllers/Extractors.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/controllers/Files.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/controllers/Search.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/services/DatasetService.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/services/VersusPlugin.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/services/fourstore/FourStoreRdfSPARQLService.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/services/mongodb/MongoDBSectionService.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
  • app/util/SearchUtils.scala (version 4cfd22deb05aceec5edd6e16d7d631a21fa9baef) (diffs)
• 

  Luigi Marini 21 Aug 2018 65ce54d49e0d7ea18d53df91f3493051a22416a5 m

  Merge branch 'master' into develop
  # Conflicts:
  #        CHANGELOG.md
• 

  Indira Gutierrez Polo 21 Aug 2018 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7 m

  Fixed extractors printing the private key in error messages

  • CHANGELOG.md (version 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7) (diffs)
  • app/services/RabbitmqPlugin.scala (version 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7) (diffs)
  • doc/src/sphinx/conf.py (version 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7) (diffs)
  • project/Build.scala (version 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7) (diffs)
  • release.sh (version 56915f7f723ac9c7c0bfc51ac32caa97498d0fb7) (diffs)
• 

  Yan Zhao 21 Aug 2018 935c05038cb61b31b63be4993521c140b1521699 m

  LDAP provider now properly sets identityId.userId.

  • CHANGELOG.md (version 935c05038cb61b31b63be4993521c140b1521699) (diffs)
  • app/controllers/Login.scala (version 935c05038cb61b31b63be4993521c140b1521699) (diffs)
• 

  Luigi Marini 16 Aug 2018 a382e1a234cc12ffb6998f04bb288cc48055fc80 m

  Merge pull request #1271 in CATS/clowder from bugfix/CATS-910-fix-swagger-documentation-format to develop
  * commit 'ff4bbae1a17ce8aeffe47c4cc100b8d8db52c216':
    First pass at replacing bad instances of .{format} throughout the swagger spec
• 

  Sara Lambert 16 Aug 2018 ff4bbae1a17ce8aeffe47c4cc100b8d8db52c216 m

  First pass at replacing bad instances of .{format} throughout the swagger spec

  • CHANGELOG.md (version ff4bbae1a17ce8aeffe47c4cc100b8d8db52c216) (diffs)
  • public/swagger.yml (version ff4bbae1a17ce8aeffe47c4cc100b8d8db52c216) (diffs)
• 

  Ben Galewsky <bengal1@illinois.ed> 15 Aug 2018 0531bea56ded46e93dc5fb193bc6db8c8a2a5c58 m

  Add overridable envionment vars to Mongo and Rabbit MQ URIs

  • CHANGELOG.md (version 0531bea56ded46e93dc5fb193bc6db8c8a2a5c58) (diffs)
  • CONTRIBUTORS.md (version 0531bea56ded46e93dc5fb193bc6db8c8a2a5c58) (diffs)
  • docker/custom.conf (version 0531bea56ded46e93dc5fb193bc6db8c8a2a5c58) (diffs)
• 

  Sara Lambert 08 Aug 2018 05d45e90a48a6c46b4d8fc360099f6335e163e0e m

  CATS-909: Disable (and force-checked) checkboxes on space-level UpdateExtractors for extractors that are enabled globally

  • app/controllers/Spaces.scala (version 05d45e90a48a6c46b4d8fc360099f6335e163e0e) (diffs)
  • app/views/spaces/updateExtractors.scala.html (version 05d45e90a48a6c46b4d8fc360099f6335e163e0e) (diffs)
• 

  Sara Lambert 08 Aug 2018 ffb054d941cfea90bad8b39c2d00e05ceeb624fd m

  CATS-908: Remove excess whitespace from both updateExtractors views

  • app/views/spaces/updateExtractors.scala.html (version ffb054d941cfea90bad8b39c2d00e05ceeb624fd) (diffs)
  • app/views/updateExtractors.scala.html (version ffb054d941cfea90bad8b39c2d00e05ceeb624fd) (diffs)
• 

  Luigi Marini 07 Aug 2018 30d1d42ea3c9957ca3aec5550f9a3240161f4fd3 m

  Merge pull request #1269 in CATS/clowder from bugfix/CATS-905-parameters-subdocument-is-escaped-in-rabbitmq-message to develop
  * commit '397b977d80f2f82cf8e08b682f6127532175ea3d':
    remove toString in parameters
• 

  Yan Zhao 07 Aug 2018 397b977d80f2f82cf8e08b682f6127532175ea3d m

  remove toString in parameters

  • CHANGELOG.md (version 397b977d80f2f82cf8e08b682f6127532175ea3d) (diffs)
  • app/api/Extractions.scala (version 397b977d80f2f82cf8e08b682f6127532175ea3d) (diffs)
• 

  Bing Zhang 07 Aug 2018 4c90a316f781de2a38a2313dc9903884edd9358f m

  Add flag to specify run extraction on this uploaded file or not in dataset.

  • CHANGELOG.md (version 4c90a316f781de2a38a2313dc9903884edd9358f) (diffs)
  • app/api/Files.scala (version 4c90a316f781de2a38a2313dc9903884edd9358f) (diffs)
  • conf/routes (version 4c90a316f781de2a38a2313dc9903884edd9358f) (diffs)
  • public/swagger.yml (version 4c90a316f781de2a38a2313dc9903884edd9358f) (diffs)
• 

  Luigi Marini 06 Aug 2018 0af74e812623088f1b1589385210f6a5da03b4bd m

  Merge pull request #1267 in CATS/clowder from CATS-868-external-login-with-only-1-provider to develop
  * commit 'b4bc3bd4f42658f01d0eae1f1b8d5935ae3204b9':
    redirect when external login with only 1 provider
• 

  Yan Zhao 03 Aug 2018 b4bc3bd4f42658f01d0eae1f1b8d5935ae3204b9 m

  redirect when external login with only 1 provider

  • CHANGELOG.md (version b4bc3bd4f42658f01d0eae1f1b8d5935ae3204b9) (diffs)
  • app/views/ss/login.scala.html (version b4bc3bd4f42658f01d0eae1f1b8d5935ae3204b9) (diffs)
• 

  Luigi Marini 26 Jul 2018 b7d1594a294673dd8264b2cef8aedf650b856f1b m

  Added ability to fire extractors based on which space they are registered with. Keeps the old way of firing based on RabbitMQ bindings and the new way of directly publish to the queues. Also adds more information to the RabbitMQ message body.

  • app/api/CurationObjects.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Datasets.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Extractions.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Files.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Folders.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Indexes.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Metadata.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Selected.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/api/Spaces.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/controllers/CurationObjects.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/controllers/Files.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/controllers/Spaces.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/CurationService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/DatasetService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/FileService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/FolderService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/MetadataService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/RabbitmqPlugin.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/SpaceService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/mongodb/MongoDBCurationService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/mongodb/MongoDBFileService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/mongodb/MongoDBFolderService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/mongodb/MongoDBMetadataService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • app/util/FileUtils.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • conf/logger.xml (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)
  • test/integration/spaces/SpaceMongoDBSpec.scala (version b7d1594a294673dd8264b2cef8aedf650b856f1b) (diffs)