Build: #9 was successful Changes by Max Burnette <mburnet88@gmail.com>
Code commits
clowder
-
Max Burnette <mburnet88@gmail.com> 3ec181da7c4c074ac36f798d1902b5e49d5ed7ab
Clean up filters + unnecessary args
Also improve logic flow in several cases- app/api/Metadata.scala (version 3ec181da7c4c074ac36f798d1902b5e49d5ed7ab) (diffs)
- app/services/MetadataService.scala (version 3ec181da7c4c074ac36f798d1902b5e49d5ed7ab) (diffs)
- app/services/mongodb/MongoDBMetadataService.scala (version 3ec181da7c4c074ac36f798d1902b5e49d5ed7ab) (diffs)
- app/views/metadatald/search.scala.html (version 3ec181da7c4c074ac36f798d1902b5e49d5ed7ab) (diffs)
-
Max Burnette <mburnet88@gmail.com> a75b828107bb8792e85fa8d7d0539e27fdf50841
Apply filter to MD Defs in Mongo
change vocabularies -> metadata_definitions -
Max Burnette <mburnet88@gmail.com> 1690304c003018af732f0d4a536bee845f26f5d1
Merge branch 'develop' into bugfix/CATS-330-fix-ability-to-select-any-metadata
-
Rob Kooper e4df4607cbc8373d339a20e2373cb08ccf45dde3 m
Merge pull request #971 in CATS/clowder from release/0.9.4.1 to develop
* commit 'ef1a49aea3f9b9ca3b65898a2e142af10bfd976e':
reset version
superAdminMode
superAdminMode
space count
add patch version
Apply Sha512 Migration to non-ByteStorage
release 0.9.4
Version bump -
Rob Kooper ef1a49aea3f9b9ca3b65898a2e142af10bfd976e m
reset version
-
Rob Kooper 51d65adb5849e3cb890bf54d36d86e39b249b388 m
Merge pull request #969 in CATS/clowder from bugfix/CATS-619-as-superuser-i-m-not-seeing-contents to release/0.9.4.1
* commit '38933aa63e73959793ee92b62f6fffc5f3b6628c':
superAdminMode
superAdminMode -
Yan Zhao 38933aa63e73959793ee92b62f6fffc5f3b6628c m
superAdminMode
-
Yan Zhao eb8b43225733dddd08be01b66c1945c96245ff84 m
superAdminMode
-
Rob Kooper 971248b86026727ed68e3752662c1bc77e78899e m
Merge pull request #801 in CATS/clowder from features/Vocabularies to develop
* commit '020f8bb0f2877e83dbc47ed52469b26aae231a23': (79 commits)
removed vocabulary_id from preview and previewservice
fixed error in permissions
removed vocabularyterm from perview per Rob's comment
Merge branch 'develop' into features/Vocabularies
fixed per Rob's comments. unused routes removed.
removed per Rob's comment
removed author stubs
removed lines unused
merged with develop. new methods added, obsolete views, methods and classes removed. there is no longer controller for vocabulary, just api.
use actual string not option string
clean up
distinguish vocab_term_id from id in jsonVocabulary.
var to val where possible
simpler method for returing all vocabularies as json
listall shows actual VocabularyTerm
added new field default value to json
WORKS
doesn't work, will remove utils method later
doesn't work, will remove utils method later
backslash plaque with returned value
... -
Yan Zhao 242314038553772175d8a6c4412e89da4699daad m
space count
-
Rob Kooper 327adc85e3a0034e9d7f982d8c051fef93543be6 m
Merge pull request #967 in CATS/clowder from sha512-disk-fix to release/0.9.4.1
* commit '58ed74a45936aef521503060e8388210033e9bee':
Apply Sha512 Migration to non-ByteStorage -
Rob Kooper f8600dc12189b3bdea5244471907b6c8cfa97dc7 m
add patch version
-
Max Burnette <mburnet88@gmail.com> 58ed74a45936aef521503060e8388210033e9bee m
Apply Sha512 Migration to non-ByteStorage
-
Rob Kooper a5831fc80b02f4c1b60141208a7e5eeb74588fcd m
version number conflict
-
Rob Kooper bd464b4ba5d330a4c66ffb1e1ee51936cdf32f2b m
release 0.9.4
-
Michal Ondrejcek c3501c8e1c6b11e4a13805bd5860a33931e3db59 m
add distinct to the datasetAll list
-
Michal Ondrejcek cf8fc274f6c5dc3321750606371d90d545b0a760 m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Rob Kooper b9d69545025d1f5bbce275df6b1af5f5c08c3d62 m
Merge pull request #951 in CATS/clowder from bugfix/SEAD-1026-distinguish-project-spaces-from to develop
* commit 'dbdf2d4523bcd8011da592e76dda723380dd6ee1':
Changing Permission of Manage Users link in space listitem
Adding .trim() and spaces on edit for dataset files and collections
Fixing the color for the icon on the collections tile. Adding a space on the space title.
use 8/4 split for lists
Rollback messages
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1026-distinguish-project-spaces-from
Updating icon for collections in dropdown. Using configuration value for spaces.title
Updating briefcase icon in list item views.
Using messages more appropriately. Using messages in home page. In collections and datasets show datasets before collections. Adding background to space title. -
Indira Gutierrez Polo dbdf2d4523bcd8011da592e76dda723380dd6ee1 m
Changing Permission of Manage Users link in space listitem
-
Rob Kooper 2fd07de2e4d3f62fbd3b03e76c10d45cc33a26e6 m
make elasticsearch plugin less talkative
-
Michal Ondrejcek 49d01a94f25176503f5eaf40c4a5bd5a063aaac9 m
comment expanded
-
Indira Gutierrez Polo 4d75f51e4b185b0f8ce7750ce344479599b1fbb1 m
Adding .trim() and spaces on edit for dataset files and collections
-
Michal Ondrejcek 9e9f83f7094416c8779980db26d905ef72d75a17 m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Indira Gutierrez Polo d29234e7b5047224742872e9131afc7653bd4afc m
Update conf/application.conf
-
Indira Gutierrez Polo 999a483129967a1b09b38f1ac7a476bdcf69f9fe m
Fixing the color for the icon on the collections tile. Adding a space on the space title.
-
Michal Ondrejcek a60222d7ae6c560882319e401eed0c708b041429 m
datasets from multiple spaces returned, search by title/name edded
- app/api/Datasets.scala (version a60222d7ae6c560882319e401eed0c708b041429) (diffs)
- app/views/file.scala.html (version a60222d7ae6c560882319e401eed0c708b041429) (diffs)
- conf/application.conf (version a60222d7ae6c560882319e401eed0c708b041429) (diffs)
- conf/routes (version a60222d7ae6c560882319e401eed0c708b041429) (diffs)
-
Rob Kooper d81b09e8e80cbb13c3deb9241fe8cd679ab081cc m
use 8/4 split for lists
-
Rob Kooper 852c8ff8aae5bff7fdaa7c85968243eca2d67474 m
Merge branch 'develop' of ssh://opensource.ncsa.illinois.edu:7999/cats/clowder into bugfix/SEAD-1026-distinguish-project-spaces-from
-
Michal Ondrejcek 77b8b17b9a6b7fa67f01737932b57bb5c353739a m
merge conflict
-
Todd Nicholson <tcnichol@illinois.edu> 020f8bb0f2877e83dbc47ed52469b26aae231a23 m
removed vocabulary_id from preview and previewservice
-
Todd Nicholson <tcnichol@illinois.edu> a7ca6f4130bd081a343b3a9eb4e3304e63673913 m
fixed error in permissions
-
Todd Nicholson <tcnichol@illinois.edu> 11fe7fffd2e59b9ad9aec97563fa39445dba3156 m
removed vocabularyterm from perview per Rob's comment
-
Todd Nicholson <tcnichol@illinois.edu> 517059ef1fc9d6cf5e1c7f7adcc6b149a92fd073 m
Merge branch 'develop' into features/Vocabularies
# Conflicts:
# app/api/Permissions.scala
# app/services/mongodb/MongoDBPreviewService.scala -
Todd Nicholson <tcnichol@illinois.edu> 339b46bfcf7a68bb213ba0724d93c95a0ff06bf4 m
Merge branch 'develop' into features/Vocabularies
# Conflicts:
# app/api/Permissions.scala
# app/services/mongodb/MongoDBPreviewService.scala -
Todd Nicholson <tcnichol@illinois.edu> ed0eef01cbbd989afc32a68dbf9a69bed6445dbf m
fixed per Rob's comments. unused routes removed.
-
Todd Nicholson <tcnichol@illinois.edu> bb52ec85634aceb3c6f699804979ad25fbccc4b0 m
removed per Rob's comment
-
Todd Nicholson <tcnichol@illinois.edu> 6e953ac7d85f8b322e166137e19bbf3962bbf3e6 m
Merge branch 'develop' into features/Vocabularies
-
Indira Gutierrez Polo 59035c2e8d32e2d8b8329af3cb61a38b94158aad m
Rollback messages
-
Indira Gutierrez Polo 7b373ecae3ebec10ca562bfaf55501c712ec2a31 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1026-distinguish-project-spaces-from
# Conflicts:
# conf/messages -
Michal Ondrejcek 171f851fb399c0b806f5806dd86f1ceaa9829c5c m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Indira Gutierrez Polo 140b83626e080bb5d2055f6d24121a47ec3401c3 m
Updating icon for collections in dropdown. Using configuration value for spaces.title
-
Indira Gutierrez Polo b4dc847b00a1b7f89527ff409d28e60195d81252 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1026-distinguish-project-spaces-from
# Conflicts:
# conf/messages -
Michal Ondrejcek 4b6bd21f0fd8c1895834ea8c7830392408d50ceb m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Michal Ondrejcek 7077df68d034ac53fa3469ab005611925839f61d m
merge conflict
-
Todd Nicholson <tcnichol@illinois.edu> 208813dfc7989d2074abbf6d4c1f3fa33b8ec68b m
removed author stubs
- app/api/VocabularyTerms.scala (version 208813dfc7989d2074abbf6d4c1f3fa33b8ec68b) (diffs)
- app/services/VocabularyTermService.scala (version 208813dfc7989d2074abbf6d4c1f3fa33b8ec68b) (diffs)
- app/services/mongodb/MongoDBVocabularyService.scala (version 208813dfc7989d2074abbf6d4c1f3fa33b8ec68b) (diffs)
- app/services/mongodb/MongoDBVocabularyTermService.scala (version 208813dfc7989d2074abbf6d4c1f3fa33b8ec68b) (diffs)
-
Michal Ondrejcek 9662628d2ad58050b82181bca3da478b0b9008eb m
remove debugging line
-
Michal Ondrejcek d48d6b04fb778d59552318ec4d1c8e82ec130e90 m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Indira Gutierrez Polo 91df2ffbb3388ea72fcbab3bee99e723d89ea6c0 m
Updating briefcase icon in list item views.
-
Indira Gutierrez Polo 28929bb5f09ec99ec84e23b874f9132f096b672a m
Using messages more appropriately. Using messages in home page. In collections and datasets show datasets before collections. Adding background to space title.
- app/controllers/Collections.scala (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- app/controllers/Datasets.scala (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- app/controllers/Spaces.scala (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- app/views/collectionofdatasets.scala.html (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- app/views/home.scala.html (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- app/views/spaces/space.scala.html (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- conf/messages (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
- public/stylesheets/themes/sead.min.css (version 28929bb5f09ec99ec84e23b874f9132f096b672a) (diffs)
-
Michal Ondrejcek e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b m
re-written back-end api, datasets derived from spaceId obtained only from the fileId
- app/api/Datasets.scala (version e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b) (diffs)
- app/controllers/Application.scala (version e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b) (diffs)
- app/services/DatasetService.scala (version e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b) (diffs)
- app/views/file.scala.html (version e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b) (diffs)
- conf/application.conf (version e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b) (diffs)
- conf/routes (version e4b9e21af7cb61ac6a3d089ce06b1d1f1876091b) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> ba810c2a07cbffd6b0f6ae5cdf9d816d3ee787c4 m
removed lines unused
- app/api/Vocabularies.scala (version ba810c2a07cbffd6b0f6ae5cdf9d816d3ee787c4) (diffs)
- app/api/VocabularyTerms.scala (version ba810c2a07cbffd6b0f6ae5cdf9d816d3ee787c4) (diffs)
- app/models/VocabularyTerm.scala (version ba810c2a07cbffd6b0f6ae5cdf9d816d3ee787c4) (diffs)
- app/services/VocabularyService.scala (version ba810c2a07cbffd6b0f6ae5cdf9d816d3ee787c4) (diffs)
- conf/routes (version ba810c2a07cbffd6b0f6ae5cdf9d816d3ee787c4) (diffs)
-
Michal Ondrejcek 30979e973b7e01342d65af2aa79f779b77b6648f m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Michal Ondrejcek 07034055aca73181faae3654357c8e49ba20fb56 m
add spaceId decision tree
-
Todd Nicholson <tcnichol@illinois.edu> fbacfd6ba052d138ad21e3cb8d09e26480896d41 m
merged with develop. new methods added, obsolete views, methods and classes removed. there is no longer controller for vocabulary, just api.
- app/api/Vocabularies.scala (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- app/controllers/Application.scala (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- app/controllers/Vocabularies.scala (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- app/models/Vocabulary.scala (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- app/services/VocabularyService.scala (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- app/services/mongodb/MongoDBVocabularyService.scala (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- app/views/newVocabulary.scala.html (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
- conf/routes (version fbacfd6ba052d138ad21e3cb8d09e26480896d41) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 7d79d8545abb352114a52f5f798a024862c141b6 m
Merge branch 'develop' into features/Vocabularies
-
Michal Ondrejcek 3558aaaa01625f77059d64dfb2721350f03e82d6 m
add spaceId in case it is not set from the URI.
-
Michal Ondrejcek 341042352ba321079dba9b239895081194369139 m
add paramter spaceId to the api endpoint calls
- app/api/Datasets.scala (version 341042352ba321079dba9b239895081194369139) (diffs)
- app/services/DatasetService.scala (version 341042352ba321079dba9b239895081194369139) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 341042352ba321079dba9b239895081194369139) (diffs)
- app/views/file.scala.html (version 341042352ba321079dba9b239895081194369139) (diffs)
- conf/application.conf (version 341042352ba321079dba9b239895081194369139) (diffs)
- conf/routes (version 341042352ba321079dba9b239895081194369139) (diffs)
-
Michal Ondrejcek 2dac0b61a4ca5f43d84cf80ee5a10a485c6e2e3d m
Merge branch 'develop' into feature/CATS-559-move-file-between-datasets-2
-
Todd Nicholson <tcnichol@illinois.edu> 1378dc44f5731e8a92fe40f576cd6cc7d424466f m
Merge branch 'develop' into features/Vocabularies
# Conflicts:
# app/api/Permissions.scala -
Michal Ondrejcek 02122efa988ce90a72320744594e04c275776077 m
add json key 'spaces' and filter for space id in dataset select drop down menu
-
Todd Nicholson <tcnichol@illinois.edu> c2bb44838af6a862e08768681a349c042da51ff6 m
use actual string not option string
-
Todd Nicholson <tcnichol@illinois.edu> 4f0bf137cefdc10b7d38016848ff4640d8196536 m
clean up
-
Todd Nicholson <tcnichol@illinois.edu> e78a7d06bcaade760ca19de50384631c14fe80ec m
Merge branch 'develop' into features/Vocabularies
-
Todd Nicholson <tcnichol@illinois.edu> 073d59ab0a94420dfef7ee0d325f9a8501da48ed m
distinguish vocab_term_id from id in jsonVocabulary.
-
Todd Nicholson <tcnichol@illinois.edu> db337c4b1d7511a73887362a57fb482a308b33a1 m
var to val where possible
-
Todd Nicholson <tcnichol@illinois.edu> caffa327b6732d9b6a4be5517358b4bd09adf725 m
simpler method for returing all vocabularies as json
-
Todd Nicholson <tcnichol@illinois.edu> 19b9ba1b647ab086dc14781104d775c99c83a03d m
listall shows actual VocabularyTerm
-
Todd Nicholson <tcnichol@illinois.edu> 1f1e4382f89149c2246833a98bca33c1ec02680a m
added new field default value to json
-
Todd Nicholson <tcnichol@illinois.edu> f95ab89e792c16eed2242219d32437d17fff322a m
WORKS
-
Todd Nicholson <tcnichol@illinois.edu> 411b386714f62388c7821e4e502bd2a09d6c09e9 m
doesn't work, will remove utils method later
-
Todd Nicholson <tcnichol@illinois.edu> 1b406b1a265f9ebfe84730f7046b6553ee3553d1 m
doesn't work, will remove utils method later
-
Todd Nicholson <tcnichol@illinois.edu> 51811d822090bb51c97a75e995d08f9602cf92ec m
backslash plaque with returned value
- app/api/Vocabularies.scala (version 51811d822090bb51c97a75e995d08f9602cf92ec) (diffs)
- app/models/Vocabulary.scala (version 51811d822090bb51c97a75e995d08f9602cf92ec) (diffs)
- app/services/VocabularyService.scala (version 51811d822090bb51c97a75e995d08f9602cf92ec) (diffs)
- app/services/mongodb/MongoDBVocabularyService.scala (version 51811d822090bb51c97a75e995d08f9602cf92ec) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> cd9e08bb668446cdc3d408904a5b008f3448dbb0 m
fixed errors. found way to use JsArray to parse the incoming json. need some more methods in services to create and associate vocabterms with vocabularies
-
Todd Nicholson <tcnichol@illinois.edu> e6b06e46c5c53da01b5e7124a1643b0d1a8dc48e m
added create vocabterm
- app/api/Vocabularies.scala (version e6b06e46c5c53da01b5e7124a1643b0d1a8dc48e) (diffs)
- app/api/VocabularyTerms.scala (version e6b06e46c5c53da01b5e7124a1643b0d1a8dc48e) (diffs)
- app/models/VocabularyTerm.scala (version e6b06e46c5c53da01b5e7124a1643b0d1a8dc48e) (diffs)
- conf/routes (version e6b06e46c5c53da01b5e7124a1643b0d1a8dc48e) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 2981294ec4467a3377ff7bd272a7ae873247a8c1 m
added vocabularyterm to vocabulary object
-
Todd Nicholson <tcnichol@illinois.edu> 250893ab63734d0b18c227d736b288d361e49a46 m
fixes
-
Todd Nicholson <tcnichol@illinois.edu> 0fd5eb1405f828ca6dd7987c4f0c7b1d07b5c865 m
works (i think)
- app/models/Preview.scala (version 0fd5eb1405f828ca6dd7987c4f0c7b1d07b5c865) (diffs)
- app/models/ResourceRef.scala (version 0fd5eb1405f828ca6dd7987c4f0c7b1d07b5c865) (diffs)
- app/services/DI.scala (version 0fd5eb1405f828ca6dd7987c4f0c7b1d07b5c865) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version 0fd5eb1405f828ca6dd7987c4f0c7b1d07b5c865) (diffs)
- app/services/mongodb/MongoDBVocabularyTermService.scala (version 0fd5eb1405f828ca6dd7987c4f0c7b1d07b5c865) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 0776e16335b19ab484728a72fd14820bfed2d3b1 m
added mongodbserviceimpl for vocabularyterm
-
Todd Nicholson <tcnichol@illinois.edu> 37fc23fbb8fe1621508925974d59cb1fe5f1cd76 m
added vocabularyTermService
-
Todd Nicholson <tcnichol@illinois.edu> 64b760c9c49582404ae12447e992a52609759eca m
Merge branch 'develop' into features/Vocabularies
-
Todd Nicholson <tcnichol@illinois.edu> 99de39a19e6454053c498514245fbfc9241ec7b7 m
fixed will write
-
Todd Nicholson <tcnichol@illinois.edu> 27ce2e96ff3380f805817b6132b2001c5c9556a8 m
added new class vocabularyTerm
The purpose is so that a key can be stored with units (option) or default value.
Example, let's say there is a Vocabulary which represents some kind of manufacturing process. The process will have Terms such as 'material' and a VocabularyTerm such as 'temperature' could contain default units (grad, kelvin) or a default value. -
Todd Nicholson <tcnichol@illinois.edu> 081a1f651613829da1bea4183a7ae6fe76af1f65 m
merge
-
Todd Nicholson <tcnichol@illinois.edu> 664b36627575fdab723f669ee2fb854b38ea5ab1 m
added boolean isPublic to models.Vocabularyadded boolean isPublic to models.Vocabulary
- app/api/Admin.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/ApiController.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/Collections.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/Datasets.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/Events.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/Permissions.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/Spaces.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/api/Vocabularies.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Admin.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Application.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Collections.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Datasets.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Events.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Files.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Folders.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Metadata.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Profile.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/SecuredController.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Spaces.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Users.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/controllers/Vocabularies.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/models/Event.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/models/User.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/models/Vocabulary.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/services/FileService.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/services/mongodb/MongoDBUserService.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/services/mongodb/MongoSalatPlugin.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/util/Mail.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/admin/users.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collectionList.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collectionofdatasets.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collections/childCollections.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collections/datasetsInCollection.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collections/listchildcollection.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collections/listitem.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collections/parentAllocation.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/collections/tile.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/datasetList.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/datasets/collections.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/datasets/listitem.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/datasets/tile.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/eventsList.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/file.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/files/listitem.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/files/tile.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/folders/listitem.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/home.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/index.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/main.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/newVocabulary.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/spaces/collectionsGrid.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/spaces/listItem.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/spaces/space.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/spaces/spaceAllocation.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/spaces/tile.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/spaces/updateExtractors.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/users/followingCollections.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- app/views/users/followingDatasets.scala.html (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- conf/routes (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- public/javascripts/collectionModify.js (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- public/javascripts/datasets/collections.js (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- public/javascripts/deleteUtils.js (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- public/javascripts/spaceModify.js (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- public/javascripts/vocabulary-create.js (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- scripts/web/tests/tests.py (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
- test/integration/app-server/ApplicationSpec.scala (version 664b36627575fdab723f669ee2fb854b38ea5ab1) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 60cb828e5532f1fc4d7b6445ef74e494b4f210f7 m
needs to post in method, since json is sent
-
Luigi Marini c4965a26b804f919a9767427ba8de01b2318454d m
Version bump
-
Todd Nicholson <tcnichol@illinois.edu> d2bca1e2f0aa98d403e26a6c61e79bab74ca6b18 m
changed which view is used
-
Todd Nicholson <tcnichol@illinois.edu> 251e179906ef4ebb826093496ed3d4a9a20e55aa m
adds to space works, but white space problems with keys and description fields.
-
Todd Nicholson <tcnichol@illinois.edu> e6354f3436e4ec2dd60a391f759b947fe782b1a8 m
very sloppy view works - needs improvement.
- app/controllers/Vocabularies.scala (version e6354f3436e4ec2dd60a391f759b947fe782b1a8) (diffs)
- app/views/newVocabulary.scala.html (version e6354f3436e4ec2dd60a391f759b947fe782b1a8) (diffs)
- conf/routes (version e6354f3436e4ec2dd60a391f759b947fe782b1a8) (diffs)
- public/javascripts/vocabulary-create.js (version e6354f3436e4ec2dd60a391f759b947fe782b1a8) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> e5cbbb41b3b20e265520186ae26b9fa31c153597 m
compiles. newVocabulary or submit does not yet work
- app/controllers/Application.scala (version e5cbbb41b3b20e265520186ae26b9fa31c153597) (diffs)
- app/controllers/Vocabularies.scala (version e5cbbb41b3b20e265520186ae26b9fa31c153597) (diffs)
- app/views/newVocabulary.scala.html (version e5cbbb41b3b20e265520186ae26b9fa31c153597) (diffs)
- conf/routes (version e5cbbb41b3b20e265520186ae26b9fa31c153597) (diffs)
- public/javascripts/vocabulary-create.js (version e5cbbb41b3b20e265520186ae26b9fa31c153597) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> 77c666d9f538d901d826c5a3e7af8f9a2d5bf05a m
missing route from develop branch in routes file
-
Todd Nicholson <tcnichol@illinois.edu> 646541866fd8dd5be797632aa4ba748565364769 m
Merge branch 'develop' into features/Vocabularies
-
Todd Nicholson <tcnichol@illinois.edu> ac728bf3960a2d2e66225155911aa0c0aa8f33fa m
Merge branch 'develop' into features/Vocabularies
# Conflicts:
# conf/routes
conflicts resolves -
Todd Nicholson <tcnichol@illinois.edu> a7a2b0a913ad3a3487a74ad98b0acc52bfe1403f m
started adding views.
-
Todd Nicholson <tcnichol@illinois.edu> 0359d67de14ef0046d521547106ba2fc8484a110 m
started adding views.
-
Todd Nicholson <tcnichol@illinois.edu> 16b4bcfb05f1589e10caf1801ff3601bef9c5e7a m
fixed to match my gitlab-beta branch
-
Todd Nicholson <tcnichol@illinois.edu> 643541f364ec875a60df611090f0a200c990a8e5 m
fix typo in service
-
Todd Nicholson <tcnichol@illinois.edu> 3b2202d63171099049888ea083e53b4d7e9dc358 m
containsAll boolean now used to check if ALL the terms are in the description, or if any of them are
- app/api/Vocabularies.scala (version 3b2202d63171099049888ea083e53b4d7e9dc358) (diffs)
- app/services/VocabularyService.scala (version 3b2202d63171099049888ea083e53b4d7e9dc358) (diffs)
- app/services/mongodb/MongoDBVocabularyService.scala (version 3b2202d63171099049888ea083e53b4d7e9dc358) (diffs)
- conf/routes (version 3b2202d63171099049888ea083e53b4d7e9dc358) (diffs)
-
Todd Nicholson <tcnichol@illinois.edu> c29cfa9bf2f9f15c4822d8c0269c4e2661248947 m
use subset for stricter match
-
Todd Nicholson <tcnichol@illinois.edu> 2e95a831201e0d5d56cda700fed080ce62990d73 m
changed route for creating new vocabulary