Build: #2 failed
Job: default failed
Code commits
clowder
-
Indira Gutierrez Polo 0d9058d16fc157367f309f6ecf68221c61689372
Merge pull request #497 in CATS/clowder from feature/CATS-40-filter-collections-datasets-shown to feature/spaces
* commit 'e9e9bdc188d02c37bc0bcdfb945d29d6aeea86f7':
fix for collections/datasets that have no spaces
fix test
Add access counts as mouseover
check permission on a preview
remove debug code
fixes based on pull request
show mongo database used
request for list of datasets requires key
fix to collections
only show collections/datasets the user can see -
Luigi Marini 890a9319e23ddee87c190c42dd411512661aedb5
Merge pull request #501 in CATS/clowder from feature/CATS-25-remove-ability-to-upload-files-outside to feature/spaces
* commit 'f2191d2bcef7084b2848320ef9c757481c141370':
Removed parenthesis from DisabledAction.
Disabled files listing using a new DisabledAction.
Bigger navigation search box on main menu so that it looks vertically aligned. Not sure how we can vertical align the form using smaller elements.
Simplified main menu and added create buttons to listing pages. -
Luigi Marini f2191d2bcef7084b2848320ef9c757481c141370
Removed parenthesis from DisabledAction.
- app/api/ApiController.scala (version f2191d2bcef7084b2848320ef9c757481c141370) (diffs)
- app/api/Files.scala (version f2191d2bcef7084b2848320ef9c757481c141370) (diffs)
- app/controllers/Files.scala (version f2191d2bcef7084b2848320ef9c757481c141370) (diffs)
- app/controllers/SecuredController.scala (version f2191d2bcef7084b2848320ef9c757481c141370) (diffs)
-
Rob Kooper e9e9bdc188d02c37bc0bcdfb945d29d6aeea86f7
fix for collections/datasets that have no spaces
-
Rob Kooper 9dff35bbe9e4cbdabe0460652e3eed72f1e963d5
fix test
Now actually running index page test- test/integration/APITestSuite.scala (version 9dff35bbe9e4cbdabe0460652e3eed72f1e963d5) (diffs)
- test/integration/app-server/ApplicationSpec.scala (version 9dff35bbe9e4cbdabe0460652e3eed72f1e963d5) (diffs)
- test/integration/app-server/ApplicationTestSuite.scala (version 9dff35bbe9e4cbdabe0460652e3eed72f1e963d5) (diffs)
-
Rob Kooper cd480a4f72cbdb8c33ff97dfe37ba726907de2aa
Add access counts as mouseover
- app/controllers/Application.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/CollectionService.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/DatasetService.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/SpaceService.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/cassandra/CassandraDataset.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
- app/views/index.scala.html (version cd480a4f72cbdb8c33ff97dfe37ba726907de2aa) (diffs)
-
Luigi Marini c5ad03261396c2522142da9e0827f716c15a4794
Disabled files listing using a new DisabledAction.
- app/api/ApiController.scala (version c5ad03261396c2522142da9e0827f716c15a4794) (diffs)
- app/api/Files.scala (version c5ad03261396c2522142da9e0827f716c15a4794) (diffs)
- app/controllers/Files.scala (version c5ad03261396c2522142da9e0827f716c15a4794) (diffs)
- app/controllers/SecuredController.scala (version c5ad03261396c2522142da9e0827f716c15a4794) (diffs)
-
Rob Kooper e83d0ad57923363facd4c33349dd6cc018641e06
check permission on a preview
- app/api/Permissions.scala (version e83d0ad57923363facd4c33349dd6cc018641e06) (diffs)
- app/api/Previews.scala (version e83d0ad57923363facd4c33349dd6cc018641e06) (diffs)
- app/controllers/SecuredController.scala (version e83d0ad57923363facd4c33349dd6cc018641e06) (diffs)
- app/models/ResourceRef.scala (version e83d0ad57923363facd4c33349dd6cc018641e06) (diffs)
-
Rob Kooper d0380d441217af519f2f8b60381abbad863b9baf
remove debug code
-
Rob Kooper ebab08239bd90024f02ac3ba39b467490f5997b2
Merge branch 'feature/spaces' of ssh://opensource.ncsa.illinois.edu:7999/cats/clowder into feature/CATS-40-filter-collections-datasets-shown
-
Luigi Marini 7c8a1a18dbbc3b35a34f811d46bb1e6c8499046d
Bigger navigation search box on main menu so that it looks vertically aligned. Not sure how we can vertical align the form using smaller elements.
-
Luigi Marini c0146e2766c933246e60430bebc02f4bb500562c
Simplified main menu and added create buttons to listing pages.
- app/views/collectionList.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- app/views/datasetList.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- app/views/filesList.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- app/views/main.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- app/views/newCollection.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- app/views/spaces/listSpaces.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- app/views/spaces/newSpace.scala.html (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
- public/stylesheets/main.css (version c0146e2766c933246e60430bebc02f4bb500562c) (diffs)
-
Yan Zhao a34ab34829548e70806bf705a70572f7080851a6
merge addDatasetToSpaces
-
Yan Zhao be18716f414e306d6b1480ce056e1a5ac762a7df
merge addDatasetToSpaces
-
Yan Zhao 744bd9c072f75805a8376da22ec7843c4b9c6d58
merge
-
Rob Kooper 9092f7ef27be8a40dacf5d7323f8d63a3584ede5
Merge pull request #484 in CATS/clowder from feature/CATS-26-a-dataset-can-be-in-multiple-spaces to feature/spaces
* commit '92e25222875bf70a23e064aa71512a164937fb6a':
Updating views to use inmutable maps. Fixing errors created when changing vars to vals.
Refactoring - Fixing some suggestions.
Clean-up
Fixing adding dataset to multiple spaces, when adding existing files to the dataset.
Fixing Users with access to dataset/collection. Adding css to the spaces in the dataset/collection
Add a dataset to multiple spaces when creating the dataset.
Add a collection to multiple spaces when creating the collection.
Add a collection to multiple spaces when creating the collection.
Adding a Collection to Multiple Spaces in the Collection View. Fix dataset to only allow to add a dataset to spaces for which the user has a role. Some Variable renaming in datasets
Removing un-needed code (modify.js). Profile.scala I accidentally changed it in local. Unneded change.
Updating templates to make them compatible with collections.
Updating templates to make them compatible with collections.
Removing space (non-list version) from Dataset Model.
Adding dataset to multiple spaces -
Rob Kooper ed1e7bbdf0bb226b32962aa59409352fbaa8aeaf
Merge pull request #480 in CATS/clowder from feature/CATS-79-organize-roles-by-resource-type-in to feature/spaces
* commit '97888af6cc97318651900edd53917067b192fb0c':
CATS79: Need not pass Permission.values to view; hence removed
CATS-79: Added collating of permissions (per role) by resource
CATS-79: Replace comma-separated permissions list with columnarized
CATS-79: Order each Role's permissions by resource -
Rob Kooper 592b9d6136e0692de07cd18e2c09c5bf2e50ed01
fixes based on pull request
- app/controllers/Collections.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
- app/controllers/Search.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
- app/controllers/Spaces.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
- app/controllers/Tags.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
- app/services/SpaceService.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
- test/integration/collections/CollectionsAPIAppSpec.scala (version 592b9d6136e0692de07cd18e2c09c5bf2e50ed01) (diffs)
-
Yan Zhao 263cb5a4d92eeb64a250b329f0fc6ea0de6f1617
split for loop to avoid additional removeUser
-
Yan Zhao e8f102270812ca5645a1e036ec1b29fe9e9ddbda
using col-xs-12 to set box-width on mobile devices
-
Yan Zhao 94bbedabebfeb7983c85228c95fed2f8c70d879a
Merge pull request #479 in CATS/clowder from bugfix/CATS-84-provide-more-information-when-user to feature/spaces
* commit '96f3f0ebda23474d7eb0568281c99ffb1a158f0c':
large word
add resource type when not authorized
add resource type when not authorized
provide info for collection & dataset
provide info for collection&dataset
provide info for collection&dataset
provide info for collection&dataset
provide info for collection& dataset
add space name when not authorized -
Rob Kooper 08916b956e04a958ede05a3b07934ad3d3239db4
show mongo database used
-
Rob Kooper 168a50d6e2e39b82e2d853619543a3f74f0a0282
request for list of datasets requires key
return list of datasets user has access to. -
Rob Kooper c5399008debfe0c59fd5ffda0027c601e6af76e5
fix to collections
make sure to use key to get list of collections
collections created through api should have a creator set! -
Rob Kooper 5df160190539b5cdb39e53b7d1ab20c88e2eb858
only show collections/datasets the user can see
Big cleanup of the mongo code to only show those datasets the user can
see. This also included some work to make the filters work correctly.
Initially we ignore the miliseconds in the timestamp which could result
in problems
Added code to show collections owned by a person.
Added a filter to make sure if you view collections/datasets owned by a
person you would only see them if you had access
Added a link from collection creator to profile page.- app/api/Collections.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/api/Datasets.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/api/Files.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/controllers/Collections.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/controllers/Datasets.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/controllers/Profile.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/controllers/Tags.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/CollectionService.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/DatasetService.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/ElasticsearchPlugin.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/cassandra/CassandraDataset.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/services/mongodb/MongoUtils.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/util/Formatters.scala (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/views/collectionofdatasets.scala.html (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- app/views/profile.scala.html (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
- conf/routes (version 5df160190539b5cdb39e53b7d1ab20c88e2eb858) (diffs)
-
Indira Gutierrez Polo 92e25222875bf70a23e064aa71512a164937fb6a
Updating views to use inmutable maps. Fixing errors created when changing vars to vals.
- app/controllers/Collections.scala (version 92e25222875bf70a23e064aa71512a164937fb6a) (diffs)
- app/controllers/Datasets.scala (version 92e25222875bf70a23e064aa71512a164937fb6a) (diffs)
- app/views/collections/users.scala.html (version 92e25222875bf70a23e064aa71512a164937fb6a) (diffs)
- app/views/datasets/users.scala.html (version 92e25222875bf70a23e064aa71512a164937fb6a) (diffs)
-
Indira Gutierrez Polo e3ae26b48a3ab7abc9a0e2d4aa98e5499c2f607d
Refactoring - Fixing some suggestions.
-
Luigi Marini 611f404a2ba97dfbac911fc27355e34cc365aefb
Merge pull request #489 in CATS/clowder from bugfix/CATS-72-creating-tag-will-run-javascript to feature/spaces
* commit 'b0962751df0cecb90203949a37e7fe1c98135431':
Changes to correctly encode the text of tags, as well as to ensure that on adding the tag text immediately after creation, it is not executed. -
Luigi Marini a00d32658fa70413e4498b8a5bee1e48c739ab4c
Merge pull request #485 in CATS/clowder from bugfix/CATS-102-fix-time-to-live-when-creating-new to feature/spaces
* commit 'c3d969c6452fb89d162fd3173170648f96b4f83a':
Fixing resource time to live when it is first created -
Winston Jansz 97888af6cc97318651900edd53917067b192fb0c
CATS79: Need not pass Permission.values to view; hence removed
-
Yan Zhao 96f3f0ebda23474d7eb0568281c99ffb1a158f0c m
large word
-
Winston Jansz fc5530eff2cf28ac2d6019b398e034513cbfe170
Merge branch 'feature/spaces' into CATS-79
-
Indira Gutierrez Polo 76ab77742d60fd2cac30292ebad3880734bebb8a
Merging 'feature/spaces' fixing conflicts.
-
Mario Felarca b0962751df0cecb90203949a37e7fe1c98135431 m
Changes to correctly encode the text of tags, as well as to ensure that on adding the tag text immediately after creation, it is not executed.
Other testing to ensure that the delete case is correctly handled, both
immediately after addition, and in the normal case.
It should be noted that there is code that is almost exactly the same
between the two files to handle these items.
Also, the UUID of tags is not used to search and delete currently. It
probably is the safer wa to do it going forward. -
Indira Gutierrez Polo c3d969c6452fb89d162fd3173170648f96b4f83a m
Fixing resource time to live when it is first created
-
Indira Gutierrez Polo b7f7d1a4aecbcb4d4b946f4050fb5c9037ee0fa6 m
Clean-up
- app/api/Permissions.scala (version b7f7d1a4aecbcb4d4b946f4050fb5c9037ee0fa6) (diffs)
- app/api/Spaces.scala (version b7f7d1a4aecbcb4d4b946f4050fb5c9037ee0fa6) (diffs)
- app/views/dataset.scala.html (version b7f7d1a4aecbcb4d4b946f4050fb5c9037ee0fa6) (diffs)
- app/views/newCollection.scala.html (version b7f7d1a4aecbcb4d4b946f4050fb5c9037ee0fa6) (diffs)
- app/views/newDataset.scala.html (version b7f7d1a4aecbcb4d4b946f4050fb5c9037ee0fa6) (diffs)
-
Indira Gutierrez Polo 81acd867f547a59243b020c3b2026f8f5398c9e5 m
Fixing adding dataset to multiple spaces, when adding existing files to the dataset.
-
Indira Gutierrez Polo 8f4380adf33ec1f9d707e4ae467dbfde9225df45 m
Fixing Users with access to dataset/collection. Adding css to the spaces in the dataset/collection
- app/api/Collections.scala (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/api/Permissions.scala (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/api/Spaces.scala (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/controllers/Collections.scala (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/controllers/Datasets.scala (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/models/Collection.scala (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/views/collections/users.scala.html (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/views/datasets/users.scala.html (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/views/spaces/spaceAllocation.scala.html (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- app/views/spaces/spaceLink.scala.html (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
- public/stylesheets/main.css (version 8f4380adf33ec1f9d707e4ae467dbfde9225df45) (diffs)
-
Indira Gutierrez Polo 6c20f85397ee81d16a60ca578f5491c689d2c2d9 m
Add a dataset to multiple spaces when creating the dataset.
- app/api/Datasets.scala (version 6c20f85397ee81d16a60ca578f5491c689d2c2d9) (diffs)
- app/controllers/Collections.scala (version 6c20f85397ee81d16a60ca578f5491c689d2c2d9) (diffs)
- app/views/newCollection.scala.html (version 6c20f85397ee81d16a60ca578f5491c689d2c2d9) (diffs)
- app/views/newDataset.scala.html (version 6c20f85397ee81d16a60ca578f5491c689d2c2d9) (diffs)
- public/javascripts/dataset-create-fileuploader.js (version 6c20f85397ee81d16a60ca578f5491c689d2c2d9) (diffs)
-
Indira Gutierrez Polo bd16b4bc4bcd4183875a0780de778b26c3d2ffc6 m
Add a collection to multiple spaces when creating the collection.
-
Winston Jansz 1acb2c5228ffdf13db3528a171664b259bf3d0c8 m
CATS-79: Added collating of permissions (per role) by resource
-
Indira Gutierrez Polo 84b943e7f86007d69e3b14998d8b6f5580ce6b2c m
Add a collection to multiple spaces when creating the collection.
-
Indira Gutierrez Polo a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb m
Adding a Collection to Multiple Spaces in the Collection View. Fix dataset to only allow to add a dataset to spaces for which the user has a role. Some Variable renaming in datasets
- app/api/Spaces.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/controllers/Application.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/controllers/Collections.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/controllers/Datasets.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/models/Collection.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/services/CollectionService.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/services/SpaceService.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/views/collectionofdatasets.scala.html (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/views/datasets/home.scala.html (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/views/spaces/spaceAllocation.scala.html (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- app/views/spaces/spaceLink.scala.html (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
- conf/routes (version a12ba14e9cd2d2ad5cc5dbfecb8091082ec359bb) (diffs)
-
Winston Jansz 6b934fe7e8dfae564db3ff8c2f814ec69a57a5db m
Merge branch 'feature/spaces' into CATS-79
-
Winston Jansz b3bb4ac89975633d87ec66ceeedfc17592819c91 m
CATS-79: Replace comma-separated permissions list with columnarized
-
Yan Zhao 2901bee9c59d0064e9fcd65d43730d41d4f21195 m
add resource type when not authorized
-
Yan Zhao 9ff230c105547eddb2ae74cf95c79dd2c31cd7b0 m
add resource type when not authorized
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> 444a3827e0e1bad920e2d7196e2c0abf3313adfa m
provide info for collection & dataset
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> 7c7c62c8dc90f86f68633590ada70f780d7ed8a2 m
provide info for collection & dataset
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> e7dfb78cccd37965afb5fcafafc6aa051dcc79bf m
provide info for collection&dataset
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> 1d04ad45622630bb17ab90ecb9d98a42f89cd9cd m
provide info for collection&dataset
- data/db/local.0 (version 1d04ad45622630bb17ab90ecb9d98a42f89cd9cd) (diffs)
- data/db/local.ns (version 1d04ad45622630bb17ab90ecb9d98a42f89cd9cd) (diffs)
- data/db/mongod.lock (version 1d04ad45622630bb17ab90ecb9d98a42f89cd9cd) (diffs)
- data/db/storage.bson (version 1d04ad45622630bb17ab90ecb9d98a42f89cd9cd) (diffs)
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> ad6b1f88c62d738d15634698af81a9ee2f2a2357 m
provide info for collection&dataset
- app/views/profile.scala.html (version ad6b1f88c62d738d15634698af81a9ee2f2a2357) (diffs)
- data/db/local.0 (version ad6b1f88c62d738d15634698af81a9ee2f2a2357) (diffs)
- data/db/local.ns (version ad6b1f88c62d738d15634698af81a9ee2f2a2357) (diffs)
- data/db/mongod.lock (version ad6b1f88c62d738d15634698af81a9ee2f2a2357) (diffs)
- data/db/storage.bson (version ad6b1f88c62d738d15634698af81a9ee2f2a2357) (diffs)
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> 0f6c865c52b35ff415510981b723e2892b1d297a m
provide info for collection& dataset
- app/controllers/SecuredController.scala (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
- app/views/notAuthorized.scala.html (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
- app/views/profile.scala.html (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
- data/db/local.0 (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
- data/db/local.ns (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
- data/db/mongod.lock (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
- data/db/storage.bson (version 0f6c865c52b35ff415510981b723e2892b1d297a) (diffs)
-
Winston Jansz 1d6efa5039b6e2e19458d0a48bae1b334e5c7616 m
CATS-79: Order each Role's permissions by resource
-
Yan <yanzhao3@wirelessprvnat-172-17-253-64.near.illinois.edu> fadf213bda6cd6ae605861c37ad1cfd212a8d65c m
add space name when not authorized
- app/controllers/Authentication.scala (version fadf213bda6cd6ae605861c37ad1cfd212a8d65c) (diffs)
- app/controllers/SecuredController.scala (version fadf213bda6cd6ae605861c37ad1cfd212a8d65c) (diffs)
- app/views/notAuthorized.scala.html (version fadf213bda6cd6ae605861c37ad1cfd212a8d65c) (diffs)
- conf/routes (version fadf213bda6cd6ae605861c37ad1cfd212a8d65c) (diffs)
-
Indira Gutierrez Polo 30221b4ff2ca681f507f06f65f8323e3e6ee97fe m
Removing un-needed code (modify.js). Profile.scala I accidentally changed it in local. Unneded change.
-
Indira Gutierrez Polo 577f180601ff507bb78f8f745c08f927b0a9534c m
Updating templates to make them compatible with collections.
-
Indira Gutierrez Polo f15638ec21a910b9f511f56de39ea0f291add446 m
Updating templates to make them compatible with collections.
- app/api/Permissions.scala (version f15638ec21a910b9f511f56de39ea0f291add446) (diffs)
- app/api/Spaces.scala (version f15638ec21a910b9f511f56de39ea0f291add446) (diffs)
- app/controllers/Datasets.scala (version f15638ec21a910b9f511f56de39ea0f291add446) (diffs)
- app/controllers/Profile.scala (version f15638ec21a910b9f511f56de39ea0f291add446) (diffs)
- app/views/datasets/home.scala.html (version f15638ec21a910b9f511f56de39ea0f291add446) (diffs)
- app/views/spaces/spaceLink.scala.html (version f15638ec21a910b9f511f56de39ea0f291add446) (diffs)
-
Indira Gutierrez Polo 2cdc6d6349d45951820f891828ddfe7633cd53f4 m
Removing space (non-list version) from Dataset Model.
- app/api/Datasets.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/api/Permissions.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/api/Spaces.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/controllers/Application.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/controllers/Datasets.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/models/Dataset.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/services/DatasetService.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/services/SpaceService.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/services/cassandra/CassandraDataset.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/views/dataset.scala.html (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/views/datasets/users.scala.html (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- app/views/spaces/spaceLink.scala.html (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
- conf/routes (version 2cdc6d6349d45951820f891828ddfe7633cd53f4) (diffs)
-
Indira Gutierrez Polo 8733152e24f51d52ad001a83b9625836eadd88ce m
Merge branch 'feature/spaces' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/CATS-26-a-dataset-can-be-in-multiple-spaces
# Conflicts:
# app/controllers/Datasets.scala
# app/models/Dataset.scala
# app/views/dataset.scala.html
# app/views/datasets/home.scala.html
# app/views/spaces/spaceLink.scala.html -
Indira Gutierrez Polo 7cac6456582f85f4f748808b6dbfbd57fd0d3fff m
Adding dataset to multiple spaces
- app/api/Datasets.scala (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/api/Spaces.scala (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/controllers/Datasets.scala (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/models/Dataset.scala (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/views/collectionofdatasets.scala.html (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/views/dataset.scala.html (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/views/datasets/home.scala.html (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/views/spaces/spaceLink.scala.html (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- app/views/spaces/userAllocation.scala.html (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)
- public/javascripts/spaces/modify.js (version 7cac6456582f85f4f748808b6dbfbd57fd0d3fff) (diffs)