clowder

• 

  Yan Zhao 04 Nov 2015 90037144558ff284a12faaddcaca785000ae3663

  typo

  • app/views/spaces/spaceAllocation.scala.html (version 90037144558ff284a12faaddcaca785000ae3663) (diffs)
• 

  Yan Zhao 04 Nov 2015 4595bab20707be32784ff4ee0a921a54b5a71b58

  typo

  • public/javascripts/spaceModify.js (version 4595bab20707be32784ff4ee0a921a54b5a71b58) (diffs)
• 

  Yan Zhao 04 Nov 2015 9c586ece913d5345197c7064bba87309b1405dee

  Merge branch 'feature/CATS-242-move-list-spaces-a-dataset-is-part' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-242-move-list-spaces-a-dataset-is-part
• 

  Yan Zhao 04 Nov 2015 a637408909e8bd1733b3f960f44cc996d8a15c59

  typo

  • app/api/Spaces.scala (version a637408909e8bd1733b3f960f44cc996d8a15c59) (diffs)
  • app/controllers/Application.scala (version a637408909e8bd1733b3f960f44cc996d8a15c59) (diffs)
  • conf/routes (version a637408909e8bd1733b3f960f44cc996d8a15c59) (diffs)
  • public/javascripts/spaceModify.js (version a637408909e8bd1733b3f960f44cc996d8a15c59) (diffs)
• 

  Rob Kooper 04 Nov 2015 d4f438116af25cdf70f903fcfc35d4b1308902b2

  remove print statements

  • app/api/Extractions.scala (version d4f438116af25cdf70f903fcfc35d4b1308902b2) (diffs)
  • app/services/PostgresPlugin.scala (version d4f438116af25cdf70f903fcfc35d4b1308902b2) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version d4f438116af25cdf70f903fcfc35d4b1308902b2) (diffs)
• 

  Rob Kooper 04 Nov 2015 81092faabec152ac93dfbcac7f732990c2718693

  no adding files to dataset, prettify dataset list

  • app/views/datasetsContainingFile.scala.html (version 81092faabec152ac93dfbcac7f732990c2718693) (diffs)
• 

  Yan Zhao 04 Nov 2015 5b992343b0488534b8355f0a585a4cc1f6bb99b6

  Merge remote-tracking branch 'origin/feature/spaces' into feature/CATS-242-move-list-spaces-a-dataset-is-part
  # Conflicts:
  #        app/services/mongodb/MongoSalatPlugin.scala
• 

  Yan Zhao 04 Nov 2015 d8779294cd49a4e660456ecc5358b51c92f7b23f m

  merge

  • app/api/Collections.scala (version d8779294cd49a4e660456ecc5358b51c92f7b23f) (diffs)
  • app/controllers/Collections.scala (version d8779294cd49a4e660456ecc5358b51c92f7b23f) (diffs)
  • app/models/Collection.scala (version d8779294cd49a4e660456ecc5358b51c92f7b23f) (diffs)
  • app/views/collectionofdatasets.scala.html (version d8779294cd49a4e660456ecc5358b51c92f7b23f) (diffs)
• 

  Yan Zhao 04 Nov 2015 5c7bd570cad1d645f62ea6d8de58366f1d851509 m

  Merge remote-tracking branch 'origin/feature/spaces' into feature/CATS-242-move-list-spaces-a-dataset-is-part
  # Conflicts:
  #        app/api/Collections.scala
  #        app/controllers/Collections.scala
  #        app/views/collectionofdatasets.scala.html
• 

  Yan Zhao 03 Nov 2015 4e5048eb1b3fd8f82de04dbbd9be33270d7eb4fa m

  roll back

  • app/services/mongodb/MongoDBCollectionService.scala (version 4e5048eb1b3fd8f82de04dbbd9be33270d7eb4fa) (diffs)
• 

  Yan Zhao 03 Nov 2015 a2c185b959b46f1f8d64c7f9cbff1bef38405952 m

  filteredQuery for collection and dataset

  • app/services/mongodb/MongoDBCollectionService.scala (version a2c185b959b46f1f8d64c7f9cbff1bef38405952) (diffs)
• 

  Yan Zhao 03 Nov 2015 f743fe4de283eadd7409947129e64a7eb08f02d2 m

  Merge remote-tracking branch 'origin/feature/spaces' into feature/CATS-242-move-list-spaces-a-dataset-is-part
  # Conflicts:
  #        app/views/collectionofdatasets.scala.html
• 

  Yan Zhao 03 Nov 2015 048b95f866876e23499f24496c264b4b935c393f m

  filteredQuery for collection and dataset

  • app/services/mongodb/MongoDBCollectionService.scala (version 048b95f866876e23499f24496c264b4b935c393f) (diffs)
  • app/views/collectionofdatasets.scala.html (version 048b95f866876e23499f24496c264b4b935c393f) (diffs)
• 

  Yan Zhao 03 Nov 2015 49b62018de34a6bda8a3eb4aaaba72ec7508af52 m

  gui modify

  • app/services/mongodb/MongoDBSpaceService.scala (version 49b62018de34a6bda8a3eb4aaaba72ec7508af52) (diffs)
  • app/views/collectionofdatasets.scala.html (version 49b62018de34a6bda8a3eb4aaaba72ec7508af52) (diffs)
  • public/javascripts/spaceModify.js (version 49b62018de34a6bda8a3eb4aaaba72ec7508af52) (diffs)
• 

  Yan Zhao 03 Nov 2015 da01c371efe9dc29e71b5d450ad3b37cae66faf2 m

  permission in MongoDBSpaceService.filteredQuery

  • app/services/mongodb/MongoDBSpaceService.scala (version da01c371efe9dc29e71b5d450ad3b37cae66faf2) (diffs)
• 

  Yan Zhao 03 Nov 2015 4106218bd13aa9ea01edfadec7ab372b5e661892 m

  update #collection or #datatset after adding to space

  • app/api/Spaces.scala (version 4106218bd13aa9ea01edfadec7ab372b5e661892) (diffs)
  • app/views/collectionofdatasets.scala.html (version 4106218bd13aa9ea01edfadec7ab372b5e661892) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version 4106218bd13aa9ea01edfadec7ab372b5e661892) (diffs)
  • public/javascripts/datasets/collections.js (version 4106218bd13aa9ea01edfadec7ab372b5e661892) (diffs)
  • public/javascripts/spaceModify.js (version 4106218bd13aa9ea01edfadec7ab372b5e661892) (diffs)
• 

  Yan Zhao 03 Nov 2015 692fc38281cbec1945366c8d89e5c7800c86074a m

  Merge remote-tracking branch 'origin/feature/CATS-189-allow-selection-of-collections-using' into feature/CATS-242-move-list-spaces-a-dataset-is-part
• 

  Yan Zhao 26 Oct 2015 dee1a602038cee98af984fffb1d5e8377085cc6b m

  permission

  • app/services/mongodb/MongoDBCollectionService.scala (version dee1a602038cee98af984fffb1d5e8377085cc6b) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version dee1a602038cee98af984fffb1d5e8377085cc6b) (diffs)
• 

  Yan Zhao 24 Oct 2015 fa6653b44292244e28bfa9f3012474433ea2b004 m

  merge

  • app/api/Spaces.scala (version fa6653b44292244e28bfa9f3012474433ea2b004) (diffs)
  • app/controllers/Datasets.scala (version fa6653b44292244e28bfa9f3012474433ea2b004) (diffs)
• 

  Yan Zhao 24 Oct 2015 5ba2c096035da6cc4d7c761bda396eafb5ed9062 m

  dataset page's tabbable

  • app/views/dataset.scala.html (version 5ba2c096035da6cc4d7c761bda396eafb5ed9062) (diffs)
• 

  Yan Zhao 24 Oct 2015 03e203634b260b299a5a60448558f5ac1c1fbf73 m

  collection's space part

  • app/api/Spaces.scala (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/controllers/Application.scala (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/services/SpaceService.scala (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/views/collectionofdatasets.scala.html (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/views/dataset.scala.html (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/views/datasets/home.scala.html (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/views/datasets/userLink.scala.html (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • app/views/spaces/spaceLink.scala.html (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
  • public/javascripts/spaceModify.js (version 03e203634b260b299a5a60448558f5ac1c1fbf73) (diffs)
• 

  Yan Zhao 24 Oct 2015 b0e80b667e96a1d74c48d399b78f3bac9ab64ddb m

  Merge remote-tracking branch 'origin/feature/CATS-189-allow-selection-of-collections-using' into feature/CATS-242-move-list-spaces-a-dataset-is-part
  # Conflicts:
  #        app/api/Spaces.scala
  #        app/controllers/Application.scala
  #        app/controllers/Datasets.scala
  #        app/services/mongodb/MongoDBSpaceService.scala
  #        app/views/collectionofdatasets.scala.html
  #        app/views/dataset.scala.html
  #        app/views/spaces/spaceAllocation.scala.html
  #        app/views/spaces/spaceLink.scala.html
  #        conf/routes
  #        public/javascripts/spaceModify.js
• 

  Yan Zhao 24 Oct 2015 2e87c759d47ac580ce2c2ce4c945c02dc7831aca m

  spaceList in dataset / collection

  • app/api/Spaces.scala (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/controllers/Application.scala (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/controllers/Datasets.scala (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/controllers/Spaces.scala (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/services/SpaceService.scala (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/views/collectionofdatasets.scala.html (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/views/dataset.scala.html (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/views/datasets/tags.scala.html (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • app/views/spaces/spaceLink.scala.html (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • conf/routes (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
  • public/javascripts/spaceModify.js (version 2e87c759d47ac580ce2c2ce4c945c02dc7831aca) (diffs)
• 

  Yan Zhao 23 Oct 2015 86db7888959d04e0652a8779868a35479999ebcc m

  add permission check to datasets.listAccess

  • app/api/Datasets.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/controllers/Application.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/controllers/Datasets.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/controllers/Tags.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/services/DatasetService.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/services/cassandra/CassandraDataset.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • app/views/datasetsContainingFile.scala.html (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
  • conf/routes (version 86db7888959d04e0652a8779868a35479999ebcc) (diffs)
• 

  Rob Kooper 22 Oct 2015 3c8f0305959522adcd7198767e491406e578b820 m

  add permission check to listAccess

  • app/api/Collections.scala (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
  • app/controllers/Application.scala (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
  • app/controllers/Collections.scala (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
  • app/services/CollectionService.scala (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
  • app/views/datasets/collections.scala.html (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
  • conf/routes (version 3c8f0305959522adcd7198767e491406e578b820) (diffs)
• 

  Yan Zhao 21 Oct 2015 a4381b01dd449cac2bdad05c189017b0d31c0be3 m

  permission AddResourceToDataset

  • app/api/Collections.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/api/Datasets.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/controllers/Application.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/controllers/Datasets.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/controllers/Profile.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/services/DatasetService.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/services/cassandra/CassandraDataset.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/views/datasets/collections.scala.html (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/views/datasetsContainingFile.scala.html (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
  • conf/routes (version a4381b01dd449cac2bdad05c189017b0d31c0be3) (diffs)
• 

  Rob Kooper 21 Oct 2015 4ffe38da79553ef9c7ad3c13f604d251071df0de m

  temp fix, not complete
  This code needs to be pushed to spaces and datasets. Also should have a
  permission flag on list api call that passes permission to list
  function. Default can be ViewXYZ.

  • app/api/Collections.scala (version 4ffe38da79553ef9c7ad3c13f604d251071df0de) (diffs)
  • app/services/CollectionService.scala (version 4ffe38da79553ef9c7ad3c13f604d251071df0de) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 4ffe38da79553ef9c7ad3c13f604d251071df0de) (diffs)
  • app/views/datasets/collections.scala.html (version 4ffe38da79553ef9c7ad3c13f604d251071df0de) (diffs)
• 

  Rob Kooper 21 Oct 2015 bb4b5baeaa0eddb06e74cb534a9d5491ca70ef8f m

  cleanup collection list function

  • app/api/Collections.scala (version bb4b5baeaa0eddb06e74cb534a9d5491ca70ef8f) (diffs)
  • app/controllers/Application.scala (version bb4b5baeaa0eddb06e74cb534a9d5491ca70ef8f) (diffs)
  • app/views/datasets/collections.scala.html (version bb4b5baeaa0eddb06e74cb534a9d5491ca70ef8f) (diffs)
  • conf/routes (version bb4b5baeaa0eddb06e74cb534a9d5491ca70ef8f) (diffs)
• 

  Rob Kooper 21 Oct 2015 27a7a1104cebb7fec3256608778825d9bf59ebbc m

  code simplification

  • app/api/Datasets.scala (version 27a7a1104cebb7fec3256608778825d9bf59ebbc) (diffs)
• 

  Rob Kooper 21 Oct 2015 3f2c06df84b7a149a2ecbe3074a4b63843fae621 m

  list spaces in api only returns spaces you have access to.

  • app/api/Spaces.scala (version 3f2c06df84b7a149a2ecbe3074a4b63843fae621) (diffs)
  • app/controllers/Application.scala (version 3f2c06df84b7a149a2ecbe3074a4b63843fae621) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version 3f2c06df84b7a149a2ecbe3074a4b63843fae621) (diffs)
  • conf/routes (version 3f2c06df84b7a149a2ecbe3074a4b63843fae621) (diffs)
• 

  Rob Kooper 21 Oct 2015 f53870395f1f126617f3be1e656583482f2be57e m

  removed redundant code (now compiles)

  • app/controllers/Application.scala (version f53870395f1f126617f3be1e656583482f2be57e) (diffs)
  • app/views/datasetsContainingFile.scala.html (version f53870395f1f126617f3be1e656583482f2be57e) (diffs)
• 

  Rob Kooper 21 Oct 2015 1c956bd8848d3d42b54a098b965a7d2d4fa5fcb6 m

  remove redundant code

  • app/api/Datasets.scala (version 1c956bd8848d3d42b54a098b965a7d2d4fa5fcb6) (diffs)
  • conf/routes (version 1c956bd8848d3d42b54a098b965a7d2d4fa5fcb6) (diffs)
• 

  Rob Kooper 21 Oct 2015 08bf3393c92e09024fee2f3bb97457ff4f927633 m

  remove code to add dataset from collection page
  This should become a search box using list dataset see CATS-235

  • app/views/collectionofdatasets.scala.html (version 08bf3393c92e09024fee2f3bb97457ff4f927633) (diffs)
  • public/javascripts/collectionDatasetsList.js (version 08bf3393c92e09024fee2f3bb97457ff4f927633) (diffs)
• 

  Yan Zhao 21 Oct 2015 514df8b37676250aca719a038712b60344d44cfa m

  typo

  • app/api/Collections.scala (version 514df8b37676250aca719a038712b60344d44cfa) (diffs)
• 

  Rob Kooper 21 Oct 2015 238c78dea1ae37b84929040def12bc1b6593761a m

  fix update of datasets and collections

  • app/services/mongodb/MongoSalatPlugin.scala (version 238c78dea1ae37b84929040def12bc1b6593761a) (diffs)
• 

  Yan Zhao 21 Oct 2015 fe13e90e33f996a7050b3b47451bb9bf27a2fd92 m

  datasets.listspace

  • app/services/mongodb/MongoDBCollectionService.scala (version fe13e90e33f996a7050b3b47451bb9bf27a2fd92) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version fe13e90e33f996a7050b3b47451bb9bf27a2fd92) (diffs)
• 

  Yan Zhao 21 Oct 2015 6338b508f346ccf4acdc5c2d34e6423e3e79c4a4 m

  Merge branch 'feature/CATS-189-allow-selection-of-collections-using' into feature/CATS-192-allow-selection-of-spaces-using3
• 

  Yan Zhao 21 Oct 2015 10fd030102a0c037ea095d752c8f83a908df7c0c m

  listDatasetCanAdd

  • app/views/datasetsContainingFile.scala.html (version 10fd030102a0c037ea095d752c8f83a908df7c0c) (diffs)
• 

  Yan Zhao 20 Oct 2015 9d759d115d44f7318405b05051e9f85bcb4f10d0 m

  roll back

  • app/api/Datasets.scala (version 9d759d115d44f7318405b05051e9f85bcb4f10d0) (diffs)
  • app/controllers/Application.scala (version 9d759d115d44f7318405b05051e9f85bcb4f10d0) (diffs)
  • app/views/datasets/collections.scala.html (version 9d759d115d44f7318405b05051e9f85bcb4f10d0) (diffs)
  • conf/routes (version 9d759d115d44f7318405b05051e9f85bcb4f10d0) (diffs)
• 

  Yan Zhao 20 Oct 2015 a7c03af1b732510c35097072d225b2360acf88b0 m

  update collection/dataset list after add/remove

  • app/api/Collections.scala (version a7c03af1b732510c35097072d225b2360acf88b0) (diffs)
  • app/views/datasets/collections.scala.html (version a7c03af1b732510c35097072d225b2360acf88b0) (diffs)
  • app/views/datasetsContainingFile.scala.html (version a7c03af1b732510c35097072d225b2360acf88b0) (diffs)
  • public/javascripts/datasets/collections.js (version a7c03af1b732510c35097072d225b2360acf88b0) (diffs)
• 

  Yan Zhao 20 Oct 2015 55a2ce6888477af84f35d59bccba261f1352c059 m

  typo in

  • app/services/mongodb/MongoSalatPlugin.scala (version 55a2ce6888477af84f35d59bccba261f1352c059) (diffs)
• 

  Yan Zhao 20 Oct 2015 ea569a457efe571bdd828f17f976bb6db00760c4 m

  permission of dataset-can-add

  • app/api/Collections.scala (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • app/api/Datasets.scala (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • app/controllers/Application.scala (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • app/views/collectionofdatasets.scala.html (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • app/views/datasets/collections.scala.html (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • app/views/datasetsContainingFile.scala.html (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • conf/routes (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
  • public/javascripts/datasets/collections.js (version ea569a457efe571bdd828f17f976bb6db00760c4) (diffs)
• 

  Yan Zhao 20 Oct 2015 41d680c3a4159637904dceb9356424e2470c2368 m

  use div instead of form in collections.scala.html

  • app/views/datasets/collections.scala.html (version 41d680c3a4159637904dceb9356424e2470c2368) (diffs)
• 

  Yan Zhao 19 Oct 2015 b4a110a09dd31b30cac1f5a6e7752dad89d9d466 m

  roll back space

  • app/api/Spaces.scala (version b4a110a09dd31b30cac1f5a6e7752dad89d9d466) (diffs)
  • app/models/Collection.scala (version b4a110a09dd31b30cac1f5a6e7752dad89d9d466) (diffs)
• 

  Yan Zhao 19 Oct 2015 a803c6c584631a6caadd0b451251bc653d73c99a m

  remove status in attachDataset

  • app/api/Collections.scala (version a803c6c584631a6caadd0b451251bc653d73c99a) (diffs)
• 

  Yan Zhao 19 Oct 2015 b2588eb8e30511046c4c224306d5a05b7b0abf38 m

  add # deprecrated in routes

  • conf/routes (version b2588eb8e30511046c4c224306d5a05b7b0abf38) (diffs)
• 

  Yan Zhao 19 Oct 2015 a711025b0912a76226971ea442c604cfac0e0514 m

  check permission to a collection to be added

  • app/api/Collections.scala (version a711025b0912a76226971ea442c604cfac0e0514) (diffs)
  • app/controllers/Application.scala (version a711025b0912a76226971ea442c604cfac0e0514) (diffs)
  • app/views/datasets/collections.scala.html (version a711025b0912a76226971ea442c604cfac0e0514) (diffs)
  • conf/routes (version a711025b0912a76226971ea442c604cfac0e0514) (diffs)
  • public/javascripts/datasets/collections.js (version a711025b0912a76226971ea442c604cfac0e0514) (diffs)
• 

  Yan Zhao 19 Oct 2015 8190235625f0c732edde1d079f933c5ee848f2ba m

  rollback p/controllers/Spaces.scala

  • app/controllers/Spaces.scala (version 8190235625f0c732edde1d079f933c5ee848f2ba) (diffs)
• 

  Yan Zhao 19 Oct 2015 ace5a53f43aee05cbea1f59a22024162558fa39c m

  remove log

  • app/api/Spaces.scala (version ace5a53f43aee05cbea1f59a22024162558fa39c) (diffs)
  • app/controllers/Spaces.scala (version ace5a53f43aee05cbea1f59a22024162558fa39c) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version ace5a53f43aee05cbea1f59a22024162558fa39c) (diffs)
  • public/javascripts/spaceModify.js (version ace5a53f43aee05cbea1f59a22024162558fa39c) (diffs)
• 

  Yan Zhao 18 Oct 2015 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da m

  use Spaces.listSpacesCanAdd().ajax

  • app/api/Spaces.scala (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/controllers/Collections.scala (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/controllers/Datasets.scala (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/controllers/Spaces.scala (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/services/SpaceService.scala (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/views/collectionofdatasets.scala.html (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/views/dataset.scala.html (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/views/datasets/home.scala.html (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • app/views/spaces/spaceLink.scala.html (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • conf/routes (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
  • public/javascripts/spaceModify.js (version 4dc7fdb5d9091636d0c5f7f35d3b0536eedb90da) (diffs)
• 

  Yan Zhao 16 Oct 2015 cdf857d04a86b471f6ec8090be4e4cf5fd8aa564 m

  small change

  • app/api/Spaces.scala (version cdf857d04a86b471f6ec8090be4e4cf5fd8aa564) (diffs)
  • conf/routes (version cdf857d04a86b471f6ec8090be4e4cf5fd8aa564) (diffs)
• 

  Yan Zhao 16 Oct 2015 6469e2c73cd8a2f6551758d60174706c0bcc5c6a m

  rollback unused code

  • app/api/Spaces.scala (version 6469e2c73cd8a2f6551758d60174706c0bcc5c6a) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version 6469e2c73cd8a2f6551758d60174706c0bcc5c6a) (diffs)
• 

  Yan Zhao 16 Oct 2015 fdb4906aceeb380368d1662fcec6793f382230ba m

  roll back test

  • app/api/Spaces.scala (version fdb4906aceeb380368d1662fcec6793f382230ba) (diffs)
  • app/views/spaces/spaceAllocation.scala.html (version fdb4906aceeb380368d1662fcec6793f382230ba) (diffs)
  • conf/routes (version fdb4906aceeb380368d1662fcec6793f382230ba) (diffs)
  • test/integration/collections/CollectionsAPIAppSpec.scala (version fdb4906aceeb380368d1662fcec6793f382230ba) (diffs)
• 

  Yan Zhao 16 Oct 2015 e1a70ba9d05c6c61664c7109eb1bfb5c2f3f3720 m

  remove /api/collections in test

  • test/integration/collections/CollectionsAPIAppSpec.scala (version e1a70ba9d05c6c61664c7109eb1bfb5c2f3f3720) (diffs)
• 

  Yan Zhao 16 Oct 2015 1e8a9d610abbd444dc40741317a9df50dd674783 m

  /api/collections/list in route

  • app/api/Collections.scala (version 1e8a9d610abbd444dc40741317a9df50dd674783) (diffs)
  • app/controllers/Datasets.scala (version 1e8a9d610abbd444dc40741317a9df50dd674783) (diffs)
  • conf/routes (version 1e8a9d610abbd444dc40741317a9df50dd674783) (diffs)
• 

  Yan Zhao 16 Oct 2015 ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4 m

  feature/CATS-188-allow-selection-of-dataset-using

  • app/api/Collections.scala (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/controllers/Application.scala (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/controllers/Datasets.scala (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/models/Collection.scala (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/services/CollectionService.scala (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/views/dataset.scala.html (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/views/datasets/collections.scala.html (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • app/views/datasetsContainingFile.scala.html (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • conf/routes (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
  • public/javascripts/datasets/collections.js (version ee34c540ec0b6f9ffe90dca3f83c0a8cc1934ac4) (diffs)
• 

  Yan Zhao 15 Oct 2015 ec75f19d1ef242fb9d18b4afcb8536c77d4b4179 m

  Merge branch 'feature/CATS-188-allow-selection-of-dataset-using' into feature/CATS-189-allow-selection-of-collections-using
• 

  Rob Kooper 06 Oct 2015 c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba m

  Ability to add a file to a dataset
  This used select2 to on demand call the api to get a list of datasets
  based on the text typed.

  • app/api/Datasets.scala (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • app/controllers/Application.scala (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • app/controllers/Files.scala (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • app/views/datasetsContainingFile.scala.html (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • app/views/file.scala.html (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • app/views/main.scala.html (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • conf/routes (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • public/javascripts/select2.min.js (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • public/stylesheets/select2-bootstrap.min.css (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
  • public/stylesheets/select2.min.css (version c7ae12dc6fcfbf46d21c1ea8c6d83947a86b31ba) (diffs)
• 

  Rob Kooper 06 Oct 2015 59cebd2bf4c37660453910deb7c989a2668c6cc3 m

  remove datasets from collection model
  This will add an update to remove all datasets from collection.
  Collection now has a count of number of datasets, and a dataset has  a
  list of collections it is a member of.

  • app/api/Collections.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/controllers/Collections.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/controllers/Search.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/models/Collection.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/models/Dataset.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/DatasetService.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/ElasticsearchPlugin.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/cassandra/CassandraDataset.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/mongodb/MongoDBCollectionService.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/mongodb/MongoDBDatasetService.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/mongodb/MongoDBSpaceService.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/services/mongodb/MongoSalatPlugin.scala (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/views/collectionList.scala.html (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/views/datasets/collections.scala.html (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)
  • app/views/spaces/collectionsGrid.scala.html (version 59cebd2bf4c37660453910deb7c989a2668c6cc3) (diffs)