|
Indira Gutierrez Polo
|
0c2e052ad243992c11366b63becc5133d98c938b
|
Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/CATS-232-remove-files-from-datasets-spaces
# Conflicts:
# app/services/mongodb/MongoSalatPlugin.scala
# app/views/dataset.scala.html |
|
|
Indira Gutierrez Polo
|
6ab1b10d904177b57195d0a06beabb8eb9573ea9
|
Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/CATS-232-remove-files-from-datasets-spaces
# Conflicts:
# app/services/mongodb/MongoSalatPlugin.scala
# app/views/dataset.scala.html |
|
|
Indira Gutierrez Polo
|
bdb91ec1f60f1e6ea5ac50b8cf8870e6bf41b739
m |
Adding try/catch in mongo salat. |
|
|
Indira Gutierrez Polo
|
d85682477a12fd5c6c7690ba5c91ce892098db32
m |
Merge Updates |
|
|
Indira Gutierrez Polo
|
55fa6c2c2878539357b3e255cfed17bbc93ef652
m |
Merge branch 'feature/CATS-189-allow-selection-of-collections-using' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/CATS-232-remove-files-from-datasets-spaces
# Conflicts:
# app/controllers/Datasets.scala
# app/services/mongodb/MongoSalatPlugin.scala
# app/views/dataset.scala.html |
|