clowder

• 

  Max Burnette <mburnet88@gmail.com> 27 Jul 2016 673a0b8d47558c245a61e9ea36c502e79a6b9437

  Merge branch 'develop' into bugfix/CATS-330-fix-ability-to-select-any-metadata
  # Conflicts:
  #        app/api/Metadata.scala
  
  Resolve merge conflict.
• 

  Rob Kooper 27 Jul 2016 65170f24fe641f39b713def791417e290f788c67 m

  Merge pull request #957 in CATS/clowder from bugfix/CATS-597-spaces-curations-xxxx-getmetadatadefinitionsbyfile to develop
  * commit 'a0e1a75c37847177ba6dbbc1d63c855355416ea5':
    getCurationByCurationFile including curationfiles within folder
• 

  Rob Kooper 27 Jul 2016 0e267857f09f26fa88b16b66058adaeaf7b0aca6 m

  Merge pull request #956 in CATS/clowder from bugfix/SEAD-934-the-metadata-dropdown-still-allows to develop
  * commit '2667e0be1ad0868ce058654dcd4d9a285491cc0e':
    enable search again
    allow for search
    roll back the wkt key - move to a new Jira task
    disabled search
• 

  Rob Kooper 27 Jul 2016 2667e0be1ad0868ce058654dcd4d9a285491cc0e m

  enable search again

  • app/views/metadatald/addMetadata.scala.html (version 2667e0be1ad0868ce058654dcd4d9a285491cc0e) (diffs)
• 

  Rob Kooper 27 Jul 2016 7fcf9ee5cc1a5a9f5367e9b9524cd1288318dcf7 m

  allow for search
  The chosen library used is a modified version that has the ability to
  add the search as an option.
  
  This is now an ability that can be enabled by setting
  add_search_option: true (default is false).
  
  See also CATS-612.

  • app/views/editProfile.scala.html (version 7fcf9ee5cc1a5a9f5367e9b9524cd1288318dcf7) (diffs)
  • app/views/geostreams/edit.scala.html (version 7fcf9ee5cc1a5a9f5367e9b9524cd1288318dcf7) (diffs)
  • app/views/metadatald/addMetadata.scala.html (version 7fcf9ee5cc1a5a9f5367e9b9524cd1288318dcf7) (diffs)
  • app/views/metadatald/search.scala.html (version 7fcf9ee5cc1a5a9f5367e9b9524cd1288318dcf7) (diffs)
  • public/javascripts/chosen.jquery.js (version 7fcf9ee5cc1a5a9f5367e9b9524cd1288318dcf7) (diffs)
• 

  Michal Ondrejcek 26 Jul 2016 a79af9f66ce14efb719824edcffe5862d396e3e2 m

  roll back the wkt key - move to a new Jira task

  • app/views/metadatald/addMetadata.scala.html (version a79af9f66ce14efb719824edcffe5862d396e3e2) (diffs)
• 

  Michal Ondrejcek 26 Jul 2016 8b537293b7d017bc1521d8bc61e8a00088ddfa8a m

  Merge branch 'develop' into bugfix/SEAD-934-the-metadata-dropdown-still-allows
• 

  Rob Kooper 26 Jul 2016 411e35c8951998a6280ed897c31e2eeda48d6308 m

  Merge pull request #962 in CATS/clowder from bugfix/SEAD-1083-terms-of-services-needs-to-be-terms to develop
  * commit '355d1c35932fb7e35a699727f177a9d9bcbadacb':
    GET https://sead2-dev.ncsa.illinois.edu/api/datasets/xxxx/metadata 401 (Unauthorized)
    post /profile/submitChanges
    terms of service
• 

  Rob Kooper 26 Jul 2016 793a74351f11928fc1d7bb91199f710923a04e99 m

  Merge pull request #959 in CATS/clowder from sead-style to develop
  * commit 'b82fd6ec8d5825a6f55624e850b056ac8f6f97b7':
    use https not http
    Renamed sead2.min.css to be sead.min.css
    Addition from Indira Gutierrez Polo for box colors
    Original theme from Michael Iannaccone
• 

  Yan Zhao 26 Jul 2016 355d1c35932fb7e35a699727f177a9d9bcbadacb m

  GET https://sead2-dev.ncsa.illinois.edu/api/datasets/xxxx/metadata 401 (Unauthorized)

  • app/controllers/Metadata.scala (version 355d1c35932fb7e35a699727f177a9d9bcbadacb) (diffs)
  • app/views/metadatald/addMetadata.scala.html (version 355d1c35932fb7e35a699727f177a9d9bcbadacb) (diffs)
• 

  Yan Zhao 26 Jul 2016 e6652d483962976800d3b3ce53c4ba3f2ebb0132 m

  post /profile/submitChanges

  • app/views/editProfile.scala.html (version e6652d483962976800d3b3ce53c4ba3f2ebb0132) (diffs)
  • conf/routes (version e6652d483962976800d3b3ce53c4ba3f2ebb0132) (diffs)
• 

  Yan Zhao 26 Jul 2016 143119fe28b698dada3abaadb648b16ceafb1916 m

  terms of service

  • app/api/ApiController.scala (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/controllers/Application.scala (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/models/Event.scala (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/models/User.scala (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/services/AppConfigurationService.scala (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/views/admin/tos.scala.html (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/views/main.scala.html (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/views/newsfeedCard.scala.html (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/views/ss/Registration/signUp.scala.html (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
  • app/views/tos.scala.html (version 143119fe28b698dada3abaadb648b16ceafb1916) (diffs)
• 

  Rob Kooper 26 Jul 2016 b82fd6ec8d5825a6f55624e850b056ac8f6f97b7 m

  use https not http

  • public/stylesheets/themes/sead.min.css (version b82fd6ec8d5825a6f55624e850b056ac8f6f97b7) (diffs)
• 

  Rob Kooper 26 Jul 2016 afe76d7b9bf3e8f3f25c072dda2962d5b9b773c1 m

  Renamed sead2.min.css to be sead.min.css

  • public/stylesheets/themes/sead.min.css (version afe76d7b9bf3e8f3f25c072dda2962d5b9b773c1) (diffs)
  • public/stylesheets/themes/sead2.min.css (version afe76d7b9bf3e8f3f25c072dda2962d5b9b773c1) (diffs)
• 

  Rob Kooper 26 Jul 2016 3649cd4f3dd61111ccfb9751403b1dd8e1962490 m

  Merge pull request #960 in CATS/clowder from bugfix/CATS-608-permission-for-add-remove-dataset to develop
  * commit '3b936e5c6c1f4cecc977fbd1e7ec57194711addf':
    AddResourceToSpace
• 

  Yan Zhao 26 Jul 2016 73bfb7b862e23556a3b5e1fd30210888dc85c6ed m

  permission for Submit file for extraction

  • app/views/file.scala.html (version 73bfb7b862e23556a3b5e1fd30210888dc85c6ed) (diffs)
• 

  Yan Zhao 26 Jul 2016 3a9ceaeb5ac3ee10000c4abcf7171a1307f8f7b6 m

  permission for Submit file for extraction

  • app/views/file.scala.html (version 3a9ceaeb5ac3ee10000c4abcf7171a1307f8f7b6) (diffs)
• 

  Yan Zhao 26 Jul 2016 a8cf855ca351e76b2c145c4fb99e98eee7588c4c m

  small fix

  • conf/application.conf (version a8cf855ca351e76b2c145c4fb99e98eee7588c4c) (diffs)
• 

  Yan Zhao 26 Jul 2016 5456145083617b4c680e36a41caf7ab3a813d203 m

  small fix

  • app/services/mongodb/MongoSalatPlugin.scala (version 5456145083617b4c680e36a41caf7ab3a813d203) (diffs)
  • app/views/file.scala.html (version 5456145083617b4c680e36a41caf7ab3a813d203) (diffs)
  • conf/application.conf (version 5456145083617b4c680e36a41caf7ab3a813d203) (diffs)
• 

  Yan Zhao 26 Jul 2016 3b936e5c6c1f4cecc977fbd1e7ec57194711addf m

  AddResourceToSpace

  • app/views/spaces/spaceAllocation.scala.html (version 3b936e5c6c1f4cecc977fbd1e7ec57194711addf) (diffs)
• 

  Rob Kooper 24 Jul 2016 f997ad6caeebe1fff7f2eb84d87d41e275f0c454 m

  Addition from Indira Gutierrez Polo for box colors

  • public/stylesheets/themes/sead2.min.css (version f997ad6caeebe1fff7f2eb84d87d41e275f0c454) (diffs)
• 

  Rob Kooper 24 Jul 2016 16b056a578d7686e0d3cea6512e0f009bee6ff23 m

  Original theme from Michael Iannaccone

  • public/stylesheets/themes/sead2.min.css (version 16b056a578d7686e0d3cea6512e0f009bee6ff23) (diffs)
• 

  Yan Zhao 19 Jul 2016 a0e1a75c37847177ba6dbbc1d63c855355416ea5 m

  getCurationByCurationFile including curationfiles within folder

  • app/services/mongodb/MongoDBCurationService.scala (version a0e1a75c37847177ba6dbbc1d63c855355416ea5) (diffs)
• 

  Michal Ondrejcek 19 Jul 2016 94ba1f7e6945b7ec08c635b43be382fd5366128c m

  Merge branch 'develop' into bugfix/SEAD-934-the-metadata-dropdown-still-allows
• 

  Michal Ondrejcek 19 Jul 2016 3dad3ebac003ba3bda5ca84474faba5d058a8c17 m

  disabled search

  • app/views/metadatald/addMetadata.scala.html (version 3dad3ebac003ba3bda5ca84474faba5d058a8c17) (diffs)