Build: #4 was successful
Job: default was successful
Code commits
clowder
-
Max Burnette <mburnet88@gmail.com> 3734d5f8a7545e899a3e11472953d70859af0961
Use Elastic Aggregations on tag lists
- app/controllers/Tags.scala (version 3734d5f8a7545e899a3e11472953d70859af0961) (diffs)
- app/services/DatasetService.scala (version 3734d5f8a7545e899a3e11472953d70859af0961) (diffs)
- app/services/ElasticsearchPlugin.scala (version 3734d5f8a7545e899a3e11472953d70859af0961) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 3734d5f8a7545e899a3e11472953d70859af0961) (diffs)
-
Max Burnette <mburnet88@gmail.com> f0173669d63ee7f3d55233632a63d4f13ba3753b
Add get ordered tags from ElasticSearch
* still need to figure out how to fetch all from ES- app/controllers/Tags.scala (version f0173669d63ee7f3d55233632a63d4f13ba3753b) (diffs)
- app/services/DatasetService.scala (version f0173669d63ee7f3d55233632a63d4f13ba3753b) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version f0173669d63ee7f3d55233632a63d4f13ba3753b) (diffs)
- app/services/mongodb/MongoDBMetadataService.scala (version f0173669d63ee7f3d55233632a63d4f13ba3753b) (diffs)
-
Max Burnette <mburnet88@gmail.com> 0eeeee85ee2f9bf49359286d1bf05a0f54b1092e
Merge branch 'develop' into bugfix/CATS-595-use-elasticsearch-in-metadata-and
-
Rob Kooper f535507e7deccd0ef1cad7ef894a5a339c74985e m
forgot to pass in inputstream
-
Yan Zhao 702be55e89a61ff462c3e533ef4e88788133c2b8 m
Merge branch 'feature/CATS-568-remove-sha512-calculation-from-within' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-568-remove-sha512-calculation-from-within
-
Yan Zhao 79e116bcb0d2213c9e417d21a8d72ee370fa03fa m
curation file sha512
-
Rob Kooper 190e63e95d6176822cafac37da0e79659026f656 m
finding broken tests
-
Max Burnette <mburnet88@gmail.com> cf97cf7bc190ba1c13d498392055a0012692ae76 m
Merge branch 'develop' into feature/CATS-568-remove-sha512-calculation-from-within
# Conflicts:
# app/services/mongodb/MongoSalatPlugin.scala
Resolved merge conflict. -
Rob Kooper f73e91669fec81f541f208175de394499a1150c6 m
Merge pull request #872 in CATS/clowder from return-ids-in-geostream-api to develop
* commit '78e97b775f758e2b24c2a0d93718644202def293':
Build failed because the previous response was Option[Option[String]]
return a bad request (so we don't return status code 200) when it failed to create an item
refactored return statements to set a val if a key was generated
return None if no ID
adds functionality to invalidate the sensor by default. adds ability to add "?invalidateCache=false" to the POST /api/geostreams/datapoints endpoint to prevent cache invalidation
changes the getDatapoint endpoint to match what is being returned from the searchDatapoints endpoint - includes the sensor ID and sensor name
returns the datapoint in the response object
update sensors and streams to return the full object of what gets created. this will prevent having to do round-trips where we POST then have to GET in our scripts. -
Rob Kooper 898af20d3b0462362173f0c0549844caee2e5312 m
Merge pull request #936 in CATS/clowder from bugfix/CATS-527-email-for-login-is-case-sensitive to develop
* commit '0904fbf90d9efbeb9654d62ba1073bcd0ac74182':
Clean up syntax & mongo call
comment
Add mongo update module to make emails lowercase
Check for userpass provider in email.lower cases
Convert email to lower on save & find
Modify login page to ask for email, instead of username -
Rob Kooper dc0149459ddb8b2d4d977913f4d4da2696f51604 m
Merge pull request #946 in CATS/clowder from feature/SEAD-984-previews-permissions to develop
* commit 'e27c0536babd168bead35bc5eac38d9034ebea7d':
Updating comments permissions on Private Mode (when logged in) Hiding the links on the Metadata view if the user is logged out.
Updating permissions for comments, sections and previews. Not showing the 'add metadata' section when the user is not defined. In the dataset page, when you are the owner updating the default option. -
Rob Kooper 04b03221193e4ce8259fe305a67b657e374f9241 m
Merge pull request #948 in CATS/clowder from feature/CATS-90-allow-to-use-orcidid-to-login-to to develop
* commit '5b275d83c0d53ce3f849b8ad13689bd9d39281b9':
add orcidprovider to play.plugins (disabled)
orcid provider -
Brock Angelo 78e97b775f758e2b24c2a0d93718644202def293 m
Build failed because the previous response was Option[Option[String]]
-
Max Burnette <mburnet88@gmail.com> b436c15a474472dd58146ccae035e2faa8aa13cc m
Make sure zero is treated as Long
-
Max Burnette <mburnet88@gmail.com> 19b35217d47efb1482eeea1af45afc8b6146d3dd m
Add Logger msg
-
Max Burnette <mburnet88@gmail.com> 2839c369e10d1846b55d75263aed3d0f83700372 m
Fix error when metadataCount is Int
-
Brock Angelo 2008220a0e94187db00f72c678e9734463eaff34 m
return a bad request (so we don't return status code 200) when it failed to create an item
-
Brock Angelo ef791189878c3ca59ea697b3992c9c15f196e428 m
refactored return statements to set a val if a key was generated
-
Brock Angelo c97c52cb5fd074fea7fb688e343d2ccf21cfe611 m
return None if no ID
-
Rob Kooper 8753871853eedd1845014596e1917d84cf91c1d5 m
Merge pull request #941 in CATS/clowder from feature/CATS-107-simple-tool-prototype to develop
* commit '9eb7a52967cb677723911b6fdc2ab3aa693d1a29':
Made method private to class. This branch also takes care of CATS-569.
Added action = "manual-submission" or "upload" to the extra info sent to extractors when submitting a file for extraction as a result of an upload action or a manual submission.
If extractor is not specified when submitting a file to a specific extractor default to submission to all extractor by matching on mime type.
Minor cleanup of submission of file to individual extractor.
When submitting a specific file to a specific extractor, make sure to send the proper message over rabbitmq.
Modified how to submit a specific file to a specific extractor. Includes both the GUI and the api endpoint.
Submit an existing file and parameters to a specific extractor. -
Luigi Marini 9eb7a52967cb677723911b6fdc2ab3aa693d1a29 m
Made method private to class. This branch also takes care of CATS-569.
-
Luigi Marini 2a08db0ad47eccebb11af09c5f59b451921c7401 m
Added action = "manual-submission" or "upload" to the extra info sent to extractors when submitting a file for extraction as a result of an upload action or a manual submission.
-
Luigi Marini baade12e9a5a283b704641b533ead1633281bba3 m
If extractor is not specified when submitting a file to a specific extractor default to submission to all extractor by matching on mime type.
-
Luigi Marini 0ff9533981cb475fec0044ab13f2e2b394f70d3e m
Minor cleanup of submission of file to individual extractor.
-
Rob Kooper 04c3ed7e4c104247745c0ec98600c710f022f663 m
Merge pull request #903 in CATS/clowder from bugfix/CATS-575-allcollections-not-return-all to develop
* commit 'acafcd2a887cf37d2c2ac86a87882551c133d764':
Adding new method for showing all collections
shoudl be fixed. merge problem caused build to break
shoudl fix error. limit was not being used
show all - takes user into account. currently was showing all. (should this be an optional value?)
revert later!!!
removed note to self
fixed a typo.
showAll uses addResourceToCollection permission now
reverting changes
fixed per Indira's comment
fixed. optional limit (default is 0 for all)
fixed by changing permisssion and limit -
Rob Kooper 3dd6acc7d3cd164be195b36a0b8ee73190b39f1f m
Merge pull request #943 in CATS/clowder from bugfix/CATS-545-add-api-spaces-id-datasets-and-api-spaces-id-collections to develop
* commit '41a2e0d5f6426699a167944f6dc52cd66a4cf61c':
Simplify JSON returned from GET request
Return entire object from api/spaces/ listDatasets, listCollections
Change variable names in collection fn
Fix typo in API doc
add api methods for all ds/collections in space -
Max Burnette <mburnet88@gmail.com> 41a2e0d5f6426699a167944f6dc52cd66a4cf61c m
Simplify JSON returned from GET request
-
Indira Gutierrez Polo acafcd2a887cf37d2c2ac86a87882551c133d764 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/CATS-575-allcollections-not-return-all
# Conflicts:
# app/services/mongodb/MongoDBCollectionService.scala -
Rob Kooper 6a3cafe54f0d7a6edceab1e97304986470a72766 m
Merge pull request #950 in CATS/clowder from bugfix/CATS-599-bug-using-messages-in-collections to develop
* commit '3fa5562e452bdb087f5b947e62bcd7251ad25d31':
Removing title and use static datasets and collection on the list pages -
Rob Kooper 59d1d898294e27525956cc17f443cdbbdd24fb72 m
Merge pull request #944 in CATS/clowder from bugfix/SEAD-1026-distinguish-project-spaces-from to develop
* commit 'b93a566803c6013a93f4ee9c2249f119a6f23e0c':
Fixing dataset edit.
Updating tiles in Home Page Hiding background when editing title in dataset and collection Updating curation tile. Removing a space in search results Fixing padding and colors in some links.
Adding left margin to the top left icons
Adding icons and surrounding colors for SEAD -
Indira Gutierrez Polo 3fa5562e452bdb087f5b947e62bcd7251ad25d31 m
Removing title and use static datasets and collection on the list pages
-
Indira Gutierrez Polo e27c0536babd168bead35bc5eac38d9034ebea7d m
Updating comments permissions on Private Mode (when logged in) Hiding the links on the Metadata view if the user is logged out.
-
Max Burnette <mburnet88@gmail.com> 56e1d71ba47c2161b0ffea2099e90f4b6970804d m
Clean up TODOs/comments
-
Max Burnette <mburnet88@gmail.com> e1ba26dcbce5f8d727b67d14811d0ca2f51c8c40 m
Still include sha in CurationObj, but pull from file md
-
Max Burnette <mburnet88@gmail.com> 45faf57e1652d13b18f481314fb5666b91d83e38 m
Return entire object from api/spaces/ listDatasets, listCollections
-
Max Burnette <mburnet88@gmail.com> c714c09d20ff175e1fa89a88a49d78d6af7e7cdf m
Add mongo migration and fixed CurationObject
-
Rob Kooper 5b275d83c0d53ce3f849b8ad13689bd9d39281b9 m
add orcidprovider to play.plugins (disabled)
-
Rob Kooper 4b2e126eeb5cecfadbeae6e2d731e1be72252140 m
orcid provider
- app/services/ORCIDProvider.scala (version 4b2e126eeb5cecfadbeae6e2d731e1be72252140) (diffs)
- app/services/mongodb/MongoDBUserService.scala (version 4b2e126eeb5cecfadbeae6e2d731e1be72252140) (diffs)
- app/views/profile.scala.html (version 4b2e126eeb5cecfadbeae6e2d731e1be72252140) (diffs)
- conf/securesocial.conf (version 4b2e126eeb5cecfadbeae6e2d731e1be72252140) (diffs)
- public/securesocial/images/providers/orcid.png (version 4b2e126eeb5cecfadbeae6e2d731e1be72252140) (diffs)
-
Indira Gutierrez Polo 0c84ec54f3369b778a73a800b1b0014de6a2b302 m
Adding new method for showing all collections
- app/api/Collections.scala (version 0c84ec54f3369b778a73a800b1b0014de6a2b302) (diffs)
- app/services/CollectionService.scala (version 0c84ec54f3369b778a73a800b1b0014de6a2b302) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 0c84ec54f3369b778a73a800b1b0014de6a2b302) (diffs)
- conf/routes (version 0c84ec54f3369b778a73a800b1b0014de6a2b302) (diffs)
-
Indira Gutierrez Polo b93a566803c6013a93f4ee9c2249f119a6f23e0c m
Fixing dataset edit.
- app/services/mongodb/MongoDBCollectionService.scala (version b93a566803c6013a93f4ee9c2249f119a6f23e0c) (diffs)
- app/views/collectionofdatasets.scala.html (version b93a566803c6013a93f4ee9c2249f119a6f23e0c) (diffs)
- app/views/dataset.scala.html (version b93a566803c6013a93f4ee9c2249f119a6f23e0c) (diffs)
- app/views/file.scala.html (version b93a566803c6013a93f4ee9c2249f119a6f23e0c) (diffs)
- public/stylesheets/themes/sead.min.css (version b93a566803c6013a93f4ee9c2249f119a6f23e0c) (diffs)
-
Indira Gutierrez Polo 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257 m
Updating tiles in Home Page Hiding background when editing title in dataset and collection Updating curation tile. Removing a space in search results Fixing padding and colors in some links.
- app/views/collectionofdatasets.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- app/views/curations/listFolder.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- app/views/dataset.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- app/views/file.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- app/views/home.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- app/views/searchResults.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- app/views/spaces/tile.scala.html (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
- public/stylesheets/themes/sead.min.css (version 37c52a2b896f04e3e2f8d6a3f7dd4d12b0b42257) (diffs)
-
Max Burnette <mburnet88@gmail.com> c2e03d7f04151eb0db3abf573aaa8d9d5d887617 m
Remove SHA512 references in code
- app/api/CurationObjects.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/api/Datasets.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/controllers/CurationObjects.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/models/CurationObject.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/models/File.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/models/Logo.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/ByteStorageService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/filesystem/DiskByteStorageService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/irods/IRODSByteStorageService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBByteStorage.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBLogoService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBThreeDService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBThumbnailService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/services/mongodb/MongoDBTileService.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/util/FileUtils.scala (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
- app/views/file.scala.html (version c2e03d7f04151eb0db3abf573aaa8d9d5d887617) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 98359721f3231b568aa4242c7bea085d17ee03a2 m
Merge branch 'develop' into bugfix/CATS-575-allcollections-not-return-all
-
Indira Gutierrez Polo 72dec106fd1692f0abff65cf90679d90b7f86ada m
Updating permissions for comments, sections and previews. Not showing the 'add metadata' section when the user is not defined. In the dataset page, when you are the owner updating the default option.
- app/api/Permissions.scala (version 72dec106fd1692f0abff65cf90679d90b7f86ada) (diffs)
- app/controllers/Datasets.scala (version 72dec106fd1692f0abff65cf90679d90b7f86ada) (diffs)
- app/views/dataset.scala.html (version 72dec106fd1692f0abff65cf90679d90b7f86ada) (diffs)
- app/views/file.scala.html (version 72dec106fd1692f0abff65cf90679d90b7f86ada) (diffs)
-
Luigi Marini 1c1a81c9a2a5eb3c4b1caba56ffd08b6c3084720 m
Merge pull request #939 in CATS/clowder from feature/SEAD-1004-implement-verified-and-trial-project to develop
* commit '6bc2e9391a110599a6a3950215f2555c4d97dd74':
Updating default messages
Fixing email to redirect to SEAD. -
Luigi Marini 15417c56c9d43ce288e2642ff4eda9ecf9e5441d m
Merge pull request #945 in CATS/clowder from bugfix/SEAD-1022-reorient-the-top-level-navigation to develop
* commit 'aef60b83c0b92c91c1db253b224b1a7d17772dcd':
Changing About to Help -
Indira Gutierrez Polo aef60b83c0b92c91c1db253b224b1a7d17772dcd m
Changing About to Help
-
Indira Gutierrez Polo 215c4fa68f664f2e99feebca9cdb592f81febea8 m
Adding left margin to the top left icons
-
Indira Gutierrez Polo 6bc2e9391a110599a6a3950215f2555c4d97dd74 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/SEAD-1004-implement-verified-and-trial-project
# Conflicts:
# conf/messages -
Max Burnette <mburnet88@gmail.com> 0904fbf90d9efbeb9654d62ba1073bcd0ac74182 m
Clean up syntax & mongo call
- use matching to avoid introducing email/userid where none existed
before
- call mongo.count instead of mongo.find when we only need total # of
conflicts -
Max Burnette <mburnet88@gmail.com> 7239d8b1019c11d45d20c0e9b21433659d67f375 m
Merge branch 'develop' into bugfix/CATS-527-email-for-login-is-case-sensitive
# Conflicts:
# conf/messages
Resolved merge conflict. -
Luigi Marini 6a5e65b12163a0285f0e07a057431121dceb285e m
Merge pull request #940 in CATS/clowder from feature/SEAD-984-previews-permissions to develop
* commit 'c5e4ce73516d555baac05d4cbbf5578fd331a43c':
Fixing typo
Adding Public (Project Space Default) and Private (Project Space Default) when the dataset space is Default -
Luigi Marini d1f89b9f2aef2d719385465d1cccedacd2fc5228 m
Merge pull request #933 in CATS/clowder from bugfix/SEAD-1022-reorient-the-top-level-navigation to develop
* commit '07dfba4b6188d0ec02338e473dc78f4f72e88f78':
Removing the All Spaces/ My Spaces toggle button
Adding 'Trial Spaces' on the 'Explore' menu
Updating verifyFilter for spaces.
Adding "My " when showPublic is false.
Merge branch 'feature/SEAD-984-public-filters' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1022-reorient-the-top-level-navigation
Reorient top level navigation -
Indira Gutierrez Polo c5c5d4b7660d21adb9666323c81e9b05bb3bf89e m
Updating default messages
-
Indira Gutierrez Polo c5e4ce73516d555baac05d4cbbf5578fd331a43c m
Fixing typo
-
Indira Gutierrez Polo 07dfba4b6188d0ec02338e473dc78f4f72e88f78 m
Removing the All Spaces/ My Spaces toggle button
-
Indira Gutierrez Polo e92b363ecbce82bad95ded8eafd3e799c04903d1 m
Adding icons and surrounding colors for SEAD
- app/views/collectionofdatasets.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/collections/listchildcollection.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/collections/listitem.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/collections/tile.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/dataset.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/datasets/listitem.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/datasets/tile.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/file.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/files/listitem.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/files/tile.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/folders/listitem.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/searchResults.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/spaces/listItem.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- app/views/spaces/tile.scala.html (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- conf/routes (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
- public/stylesheets/themes/sead.min.css (version e92b363ecbce82bad95ded8eafd3e799c04903d1) (diffs)
-
Max Burnette <mburnet88@gmail.com> c4e5f140963113e3f67c62773c8a84a6e058e6be m
Change variable names in collection fn
-
Max Burnette <mburnet88@gmail.com> 13dd9744f9b50f4d746d558010d583f47893671b m
Fix typo in API doc
-
Max Burnette <mburnet88@gmail.com> 0708434af57229e3cf3b5eb60a88b8e7514d72c8 m
add api methods for all ds/collections in space
/api/spaces/:id/datasets
/api/spaces/:id/collections -
Luigi Marini cd1a6904207381f0799197e9dc248aa7848329fa m
When submitting a specific file to a specific extractor, make sure to send the proper message over rabbitmq.
-
Luigi Marini c07da79d8f901ef0dbd4a74686200201ec8ed9f3 m
Modified how to submit a specific file to a specific extractor. Includes both the GUI and the api endpoint.
- app/api/Extractions.scala (version c07da79d8f901ef0dbd4a74686200201ec8ed9f3) (diffs)
- app/controllers/Extractors.scala (version c07da79d8f901ef0dbd4a74686200201ec8ed9f3) (diffs)
- app/views/extractions/submitExtraction.scala.html (version c07da79d8f901ef0dbd4a74686200201ec8ed9f3) (diffs)
- app/views/file.scala.html (version c07da79d8f901ef0dbd4a74686200201ec8ed9f3) (diffs)
- conf/routes (version c07da79d8f901ef0dbd4a74686200201ec8ed9f3) (diffs)
-
Indira Gutierrez Polo 4e17de6fb783462efe3520f7da8224e052b666b9 m
Adding Public (Project Space Default) and Private (Project Space Default) when the dataset space is Default
- app/api/Files.scala (version 4e17de6fb783462efe3520f7da8224e052b666b9) (diffs)
- app/controllers/Datasets.scala (version 4e17de6fb783462efe3520f7da8224e052b666b9) (diffs)
- app/controllers/Files.scala (version 4e17de6fb783462efe3520f7da8224e052b666b9) (diffs)
- app/models/LicenseData.scala (version 4e17de6fb783462efe3520f7da8224e052b666b9) (diffs)
- app/views/dataset.scala.html (version 4e17de6fb783462efe3520f7da8224e052b666b9) (diffs)
- app/views/file.scala.html (version 4e17de6fb783462efe3520f7da8224e052b666b9) (diffs)
-
Luigi Marini 4d1e1d968fa7c3aff4ef19974e9d7f1ec979008c m
Merge branch 'develop' into feature/CATS-107-simple-tool-prototype
# Conflicts:
# app/controllers/Application.scala
# app/controllers/Extractors.scala
# conf/routes -
Indira Gutierrez Polo 838f7d7bc3ff7f70870dc6969f266eee34482bf2 m
Fixing email to redirect to SEAD.
-
Rob Kooper 955e59a02723d6881e4381fa53c56923e85c9bf2 m
comment
-
Max Burnette <mburnet88@gmail.com> 5c8db222ca9e30328785da7856dffde1df944088 m
Add mongo update module to make emails lowercase
If lowercase email already exists, make uppercase email not active -
Indira Gutierrez Polo 74229dcd5fad68c9cfd2376f88e80f988eeeb94d m
Adding 'Trial Spaces' on the 'Explore' menu
- app/api/Spaces.scala (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
- app/controllers/Spaces.scala (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
- app/services/SpaceService.scala (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
- app/views/main.scala.html (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
- app/views/spaces/listSpaces.scala.html (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
- conf/routes (version 74229dcd5fad68c9cfd2376f88e80f988eeeb94d) (diffs)
-
Max Burnette <mburnet88@gmail.com> 1465676e4fd876dfee6e0e015063585560024f3b m
Check for userpass provider in email.lower cases
-
Max Burnette <mburnet88@gmail.com> 006dd3700619582f2a012eed4ae7e8644a868933 m
Convert email to lower on save & find
-
Todd Nicholson <tcnichol@illinois.edu> 7a4e44ababc3bcad096faed538c3962cd1eddfa3 m
shoudl be fixed. merge problem caused build to break
-
Max Burnette <mburnet88@gmail.com> 55af37afe3b9f280db3280b8ad84a3aed85c1359 m
Merge branch 'develop' into bugfix/CATS-527-email-for-login-is-case-sensitive
# Conflicts:
# conf/messages
Fix merge conflict. -
Todd Nicholson <tcnichol@illinois.edu> 6938834d19ba3845e7575fc0c424867f1a06aafc m
shoudl fix error. limit was not being used
-
Todd Nicholson <tcnichol@illinois.edu> 19ff7ede49d03353c59a573c4a5a8ce0735b33d0 m
Merge branch 'develop' into bugfix/CATS-575-allcollections-not-return-all
# Conflicts:
# app/api/Collections.scala -
Indira Gutierrez Polo ddde3cd94e35c3869b8fb08bcee8672aa451b728 m
Updating verifyFilter for spaces.
- app/controllers/Collections.scala (version ddde3cd94e35c3869b8fb08bcee8672aa451b728) (diffs)
- app/controllers/Datasets.scala (version ddde3cd94e35c3869b8fb08bcee8672aa451b728) (diffs)
- app/controllers/Spaces.scala (version ddde3cd94e35c3869b8fb08bcee8672aa451b728) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version ddde3cd94e35c3869b8fb08bcee8672aa451b728) (diffs)
- app/views/main.scala.html (version ddde3cd94e35c3869b8fb08bcee8672aa451b728) (diffs)
- conf/messages (version ddde3cd94e35c3869b8fb08bcee8672aa451b728) (diffs)
-
Indira Gutierrez Polo b47a494c8cb1b82509c1b91558d3dff3d22afa4d m
Adding "My " when showPublic is false.
- app/controllers/Collections.scala (version b47a494c8cb1b82509c1b91558d3dff3d22afa4d) (diffs)
- app/controllers/Datasets.scala (version b47a494c8cb1b82509c1b91558d3dff3d22afa4d) (diffs)
- app/controllers/Spaces.scala (version b47a494c8cb1b82509c1b91558d3dff3d22afa4d) (diffs)
- app/views/main.scala.html (version b47a494c8cb1b82509c1b91558d3dff3d22afa4d) (diffs)
-
Indira Gutierrez Polo bedae7075114685c4e53989695fa8f46a6c2d219 m
Merge branch 'feature/SEAD-984-public-filters' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1022-reorient-the-top-level-navigation
# Conflicts:
# app/controllers/Application.scala
# app/controllers/Datasets.scala
# app/services/mongodb/MongoDBSpaceService.scala
# conf/application.conf
# conf/routes- app/api/Spaces.scala (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- app/controllers/Datasets.scala (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- app/controllers/Spaces.scala (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- app/services/SpaceService.scala (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- app/views/home.scala.html (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- app/views/main.scala.html (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
- conf/routes (version bedae7075114685c4e53989695fa8f46a6c2d219) (diffs)
-
Indira Gutierrez Polo 4dd69a3b04a4cdecd81fd8530b0c712413dbc902 m
Merge branch 'feature/SEAD-984-public-filters' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1022-reorient-the-top-level-navigation
# Conflicts:
# app/controllers/Application.scala
# app/controllers/Datasets.scala
# app/services/mongodb/MongoDBSpaceService.scala
# conf/application.conf
# conf/routes -
Indira Gutierrez Polo f18ec7b0b3be140393835da99d8d478aa5301856 m
Reorient top level navigation
- app/api/Spaces.scala (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- app/controllers/Application.scala (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- app/controllers/Datasets.scala (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- app/controllers/Spaces.scala (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- app/services/SpaceService.scala (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- app/views/main.scala.html (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- conf/application.conf (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
- conf/routes (version f18ec7b0b3be140393835da99d8d478aa5301856) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 0d66bf11196c9e5f3151c4757d8afee1532b3288 m
Merge remote-tracking branch 'origin/bugfix/CATS-575-allcollections-not-return-all' into bugfix/CATS-575-allcollections-not-return-all
-
Todd Nicholson <tcnichol@illinois.edu> bc91b03a467fccaf5212a4e16b9c05d1b3561f16 m
show all - takes user into account. currently was showing all. (should this be an optional value?)
-
Todd Nicholson <tcnichol@illinois.edu> b49855748842ba53f8153ce5f545ba08386293ee m
Merge remote-tracking branch 'origin/bugfix/CATS-575-allcollections-not-return-all' into bugfix/CATS-575-allcollections-not-return-all
-
Todd Nicholson <tcnichol@illinois.edu> cec2a35c2d40fa64ec39e876e61ae443e1d94bb3 m
revert later!!!
-
Todd Nicholson <tcnichol@illinois.edu> d7b8f01280ef58ff784017241b6782e7b6813e98 m
Merge branch 'develop' into bugfix/CATS-575-allcollections-not-return-all
# Conflicts:
# app/services/mongodb/MongoDBCollectionService.scala -
Todd Nicholson <tcnichol@illinois.edu> bd51bec8fbb8a3ae3def7ea079c3730564fe2e3d m
Merge branch 'develop' into bugfix/CATS-575-allcollections-not-return-all
-
Todd Nicholson <tcnichol@illinois.edu> 2d0ad3a5ce976af89ac82a0793672577667f23bf m
Merge branch 'develop' into bugfix/CATS-575-allcollections-not-return-all
-
Todd Nicholson <tcnichol@illinois.edu> 04babc21099a42e82de29967493d26e0b13eaac0 m
removed note to self
-
Todd Nicholson <tcnichol@illinois.edu> 90d2d7ca925584fd9b1c19fd7ed7c9fc1ed5cb07 m
fixed a typo.
-
Todd Nicholson <tcnichol@illinois.edu> f58cf9f48463e3957d2e2971875dd138170c9480 m
showAll uses addResourceToCollection permission now
-
Todd Nicholson <tcnichol@illinois.edu> b5a7549d1ea203fd2890d693b2ba329f1b54a0ac m
reverting changes
-
Todd Nicholson <tcnichol@illinois.edu> 1fc19c60056a9a18fbcd69e0d56b2d8a0c588161 m
fixed per Indira's comment
-
Todd Nicholson <tcnichol@illinois.edu> eeeaccc32f76c910e9f875097d816fe9d32f01c5 m
fixed. optional limit (default is 0 for all)
-
Todd Nicholson <tcnichol@illinois.edu> 680358a620631926e85ba21be5a08edd957fb860 m
fixed by changing permisssion and limit
-
Brock Angelo 8169bc6f90a03b81fde1e5135f48a2111c8508d3 m
adds functionality to invalidate the sensor by default. adds ability to add "?invalidateCache=false" to the POST /api/geostreams/datapoints endpoint to prevent cache invalidation
-
Brock Angelo 230ecd9a02d5c26477410f23d514fd3ba923af8b m
changes the getDatapoint endpoint to match what is being returned from the searchDatapoints endpoint - includes the sensor ID and sensor name
-
Brock Angelo 251da5831f73f14dbdb0ab4af0224c6823a7075e m
Merge branch 'develop' into return-ids-in-geostream-api
-
Brock Angelo 16c474e7890b3aa8316cfb737a13de4adc2c0b98 m
returns the datapoint in the response object
-
Brock Angelo 3a5c5bc998b60bf2a52c5c88efa98b9e7d021bd5 m
Merge branch 'develop' into return-ids-in-geostream-api
-
Brock Angelo 4c4065b60d25ea27f3493553837cfe85a6b93d77 m
Merge branch 'develop' into return-ids-in-geostream-api
-
Max Burnette <mburnet88@gmail.com> 934f2fea8770fece8ac62799053f88b79abebd20 m
Modify login page to ask for email, instead of username