Build: #2 was successful Changes by Max Burnette <mburnet88@gmail.com> and Luigi Marini
Code commits
clowder
-
Max Burnette <mburnet88@gmail.com> e9abf6c8d3d0ef7e0d8d8c04904d7eba44358c52
Merge branch 'overhaul-elasticsearch' into terra-dev-instance
-
Max Burnette <mburnet88@gmail.com> 7e752a929bfbae4425d2db647b03c0708d471a7a
Merge branch 'develop' into overhaul-elasticsearch
Resolve merge conflicts. -
Luigi Marini d62064f35509b7d5454cf4129c798d3ff97ceb67
Merge pull request #1082 in CATS/clowder from ~JIMMYERS/clowder:noQuicktime to develop
* commit '6f9b615776c412e432599c5d0b7acbf3c32bcb89':
moving video support out of the QT previewer and checking for a plugin when working with QT VR panoramas.
making video size reactive like Quicktime preview so video stays within the page layout
Check for presence of Quicktime plugin and if it doesn't exist, try the HTML5 video tag for videos ... (Note that Quicktime for Windows is no longer supported by Apple and is being removed in organizations due to security concerns) -
Luigi Marini e0a0d0e9f707b9744796710cb1529a8dae1557ba
Increased version on develop to 1.x
-
Luigi Marini 0f337c56176da371cca9805a51f9bd4375d4d528
Merge pull request #1076 in CATS/clowder from ~JIMMYERS/clowder:bugfix/SEAD-1134-can-t-re-add-a-metadata-definition to develop
* commit '95e1a820531762a406093b43a29e752dac949c4c':
addDefinitionHelper should only check the current space/or None when deciding if a def exists (unless/until we do something more to sync defs across spaces) -
Luigi Marini f4a644a6567cb551faad72d7704be8b43dddcb23
Fixed merge conflicts of v1.0.0 and current develop.
-
Luigi Marini 8f382eea68fc9bf51f6aa73cabc6d1c2cdcb3459
Merge branch 'master' into merge/v1.0.0-into-develop
# Conflicts:
# app/controllers/Extractors.scala
# app/views/collections/users.scala.html
# app/views/extractions/submitDatasetExtraction.scala.html
# public/jsonld/contexts/metadata.jsonld
# test/unit/extractions/ExtractionHTMLControllerSpec.scala -
Luigi Marini c9168724a6c313068cdc73b255c4ac05b556e67f m
Merge pull request #1072 in CATS/clowder from feature/GEOD-783-query-datapoints-search-and-return to develop
* commit '39ffade4c92937696fea77510905d78693ee8156':
Adding onlyCount option to the datapoints endpoint -
Luigi Marini feac386125d6991e2a8cc1c1c5f89d8c9dc72f24 m
Merge pull request #1071 in CATS/clowder from ~JIMMYERS/clowder:bugfix/download-naming to develop
* commit '74d7c543624679cb17e65a59dd35ce61c34391ba':
Clarifying return value
Using single method to create the CONTENT-DISPOSITION header value across all calls that use it. -
Jim Myers 6f9b615776c412e432599c5d0b7acbf3c32bcb89 m
moving video support out of the QT previewer and checking for a plugin when working with QT VR panoramas.
- public/javascripts/previewers/Quicktime/package.json (version 6f9b615776c412e432599c5d0b7acbf3c32bcb89) (diffs)
- public/javascripts/previewers/Quicktime/some-library.js (version 6f9b615776c412e432599c5d0b7acbf3c32bcb89) (diffs)
- public/javascripts/previewers/video/package.json (version 6f9b615776c412e432599c5d0b7acbf3c32bcb89) (diffs)
-
Jim Myers 74d7c543624679cb17e65a59dd35ce61c34391ba m
Clarifying return value
-
Jim Myers 6ceee1b04241617bbb12115541bf41c5962c19d6 m
making video size reactive like Quicktime preview so video stays within the page layout
-
Jim Myers a6b53021c7dd084a718a9690d571fcdc77e949a8 m
Check for presence of Quicktime plugin and if it doesn't exist, try the HTML5 video tag for videos ... (Note that Quicktime for Windows is no longer supported by Apple and is being removed in organizations due to security concerns)
-
Indira Gutierrez Polo a430fb419561a565ad5a23b059f45d009d3e4050 m
Renaming url to be redirected to in delete collection
-
Luigi Marini 11525d75766bf7df51ed5cee0d21baa2823b4c99 m
Merge pull request #1031 in CATS/clowder from ~JIMMYERS/clowder:bugfix/SEAD-1125-publish-button-isn-t-sync-d-with to develop
* commit '086ad6a8e43364145f03ed0ac4eaf3636ed2540b':
updated in all 3 places to work when sharing is enabled
making this all work when space sharing is enabled per Indira's review comment.
Use the 'disabled' class to turn the publish link on/off -
Luigi Marini f566a52610fb3125c28c082e308d2d63a4856ef1 m
Merge pull request #1055 in CATS/clowder from ~JIMMYERS/clowder:bugfix/CATS-682-add-to-collection-to-collection to develop
* commit '3a79c9783a845b9f70313f4be5e76a1e39f49506':
make listPossibleParents pass partial titles forward to underlying call to list collections (also add pasting of date - this appears to always be None in current uses, but if sent, it should be used...) -
Luigi Marini 780f3b68b782cb88a37aa939d55ac6915f514d06 m
Merge pull request #1030 in CATS/clowder from ~JIMMYERS/clowder:bugfix/SEAD-1082-tags-sent-in-wrong-place-in-oremap to develop
* commit '8278f3f05814c44fe225dbd55f209aa77f4d6486':
Moving tags/keywords from OREMap itself to the Aggregation it 'describes' -
Luigi Marini 43e84a7848c710cdaca8fe297d64b543a858d14d m
Merge pull request #1029 in CATS/clowder from ~JIMMYERS/clowder:bugfix/SEAD-1124 to develop
* commit '144eca36e97a135d54f866ad7268bea8b2517110':
Metadata context popups had a race condition - if the mouse left the element before the ajax call returned a value, the 'hide' call occurred before the 'show' and the popup stayed up. This fix adds a class 'popping' when the mouseover triggers the popup. Mouse out remove the class and, if the ajax call returns after the class has been removed, the popup is only flashed up briefly. Otherwise, it works as intended and the popup remains until a mouse out. -
Michal Ondrejcek e303630802c51843d1d19bc90471090730e5bcbc m
fixed typos
-
Michal Ondrejcek b490a354d42c9bb70134d59ccd64547cbec7a068 m
change option to some and change if logic
-
Jim Myers 95e1a820531762a406093b43a29e752dac949c4c m
addDefinitionHelper should only check the current space/or None when deciding if a def exists (unless/until we do something more to sync defs across spaces)
-
Max Burnette <mburnet88@gmail.com> 5d7c95830b45aea91dc231fe5f47f5a514613503 m
Merge branch 'develop' into overhaul-elasticsearch
# Conflicts:
# app/services/mongodb/MongoDBFileService.scala
- ported dataset folder indexing from Yan -
Michal Ondrejcek 2ba8333e2acac7cff86956922a37b994dae890b3 m
Text changed in a tile of public datasets
-
Michal Ondrejcek 459c8675968afec3065366ac2665cc9820a52cb9 m
Comment out the Staging plugin
-
Michal Ondrejcek 8bd4f06ba3b77a8ea597a269d16db4ec75d25bff m
Text changes per request in the Public and Published tabs. Disable Published tab until the use of DOI and remote repositories is resolved
- app/views/spaces/collectionsBySpace.scala.html (version 8bd4f06ba3b77a8ea597a269d16db4ec75d25bff) (diffs)
- app/views/spaces/curationObjectsBySpace.scala.html (version 8bd4f06ba3b77a8ea597a269d16db4ec75d25bff) (diffs)
- app/views/spaces/datasetsBySpace.scala.html (version 8bd4f06ba3b77a8ea597a269d16db4ec75d25bff) (diffs)
- app/views/spaces/space.scala.html (version 8bd4f06ba3b77a8ea597a269d16db4ec75d25bff) (diffs)
- conf/play.plugins (version 8bd4f06ba3b77a8ea597a269d16db4ec75d25bff) (diffs)
-
Jim Myers 086ad6a8e43364145f03ed0ac4eaf3636ed2540b m
Merge remote-tracking branch 'origin/develop' into bugfix/SEAD-1125-publish-button-isn-t-sync-d-with
-
Jim Myers a77915393b966ee775508c0b8a085d42100be7a2 m
Merge remote-tracking branch 'origin/develop' into bugfix/CATS-621-entrypoint.sh-keeps-appending-entries
-
Jim Myers 3a79c9783a845b9f70313f4be5e76a1e39f49506 m
Merge remote-tracking branch 'origin/develop' into bugfix/CATS-682-add-to-collection-to-collection
-
Jim Myers 8278f3f05814c44fe225dbd55f209aa77f4d6486 m
Merge remote-tracking branch 'origin/develop' into bugfix/SEAD-1082-tags-sent-in-wrong-place-in-oremap
-
Indira Gutierrez Polo 39ffade4c92937696fea77510905d78693ee8156 m
Adding onlyCount option to the datapoints endpoint
-
Jim Myers 8b70372d642b359b73a6f2f9888e32ba07059541 m
Merge remote-tracking branch 'origin/develop' into bugfix/download-naming
-
Jim Myers 4c814e98fb6dc78ef8eec85c008dfa8dcceec948 m
Merge pull request #9 in ~JIMMYERS/clowder from CATS/clowder:develop to develop
* commit 'bae06c72359b1344fb7882228d4c9ae5a8895445': (29 commits)
Added improvements to CONTRIBUTING.md
Added improvements to CONTRIBUTING.md
removing html from space allocation
Adding Breadcrumbs to the submitted Curation Object Page
Links cleanup and made a few terms consistent throughout CONTRIBUTING.md
typos
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/SEAD-1025-add-breadcrumb-navigation
Beginning CONTRIBUTING.md file.
index file in folder has correct dataset name
Adding breadcrumbs on spacesList
Adding breadcrumbs on collectionList
Adding breadcrumbs on datasetList, createStep2 and addFiles to Dataset pages
htmlEncode and Decode in the license form
html decode on chosen-select
remove x
use java 1.7 parsing of data/time
Merge pull request #1056 in CATS/clowder from bugfix/reindex-bug-23 to release/1.0
Merge pull request #1060 in CATS/clowder from bugfix/find-extractor-by-name to release/1.0
rollback.
Setting up to return datapoints if there are strings (not only doubles values)
... -
Jim Myers 6e2a5846bf15069bbce623b91f93b5dc80f1c75b m
Using single method to create the CONTENT-DISPOSITION header value across all calls that use it.
The updated method should handle spaces in filenames across browsers and
provide an 'ugly but representative' string when special characters
and/or unicode chars are used:
The method first encodes special characters (some of % ,/=&:;?"*) and
then utf-8 encodes the string. Browsers (Chrome, IE, Edge, Firefox) on
Windows appear to decode that differently but ~reasonable way:
simple text with/without spaces appears verbatim
text with special characters mixes decoding verbatim or replacing
disallowed chars with an _ (/\:,?|<> are not allowed on Windows)
adding unicode triggers utf-8 with quoted printable encoding. While
these strings are 'ugly' the quoted printable encoding makes the
ordinary characters visible which helps.
Other notes:
Clowder itself html escapes characters such as & < and > when you edit a
title and the display and download end up with, for example "&"
instead of &.
Different browsers appear to truncate filenames at different lengths, so
long unicode titles may end up as different filenames on disk depending
on browser for this as well as the decoding differences discussed above.- app/api/Datasets.scala (version 6e2a5846bf15069bbce623b91f93b5dc80f1c75b) (diffs)
- app/api/Files.scala (version 6e2a5846bf15069bbce623b91f93b5dc80f1c75b) (diffs)
- app/api/Previews.scala (version 6e2a5846bf15069bbce623b91f93b5dc80f1c75b) (diffs)
- app/controllers/Files.scala (version 6e2a5846bf15069bbce623b91f93b5dc80f1c75b) (diffs)
- app/util/FileUtils.scala (version 6e2a5846bf15069bbce623b91f93b5dc80f1c75b) (diffs)
-
Rob Kooper bae06c72359b1344fb7882228d4c9ae5a8895445 m
Merge pull request #1070 in CATS/clowder from release/1.0 to develop
* commit '00cbd388e8e73dd100e8edf89f83268665ef637c':
Added improvements to CONTRIBUTING.md
Added improvements to CONTRIBUTING.md
removing html from space allocation
Links cleanup and made a few terms consistent throughout CONTRIBUTING.md
typos
Beginning CONTRIBUTING.md file.
index file in folder has correct dataset name
htmlEncode and Decode in the license form
html decode on chosen-select
remove x
use java 1.7 parsing of data/time
Merge pull request #1056 in CATS/clowder from bugfix/reindex-bug-23 to release/1.0
Merge pull request #1060 in CATS/clowder from bugfix/find-extractor-by-name to release/1.0 -
Luigi Marini b05c24bc7ea56dcfabcc437da9dd853647e0f431 m
Merge pull request #1059 in CATS/clowder from bugfix/GLM-54-update-stack-line-visualization-to to develop
* commit 'd1e3d8939f0d820f5b459d07f6fdecdc3c198184':
rollback.
Setting up to return datapoints if there are strings (not only doubles values) -
Luigi Marini ff97cc5466d2e5df406ec4a866a79d8225ef0996 m
Merge pull request #795 in CATS/clowder from feature/CATS-438-validate-all-jsonld to develop
* commit 'af61a434bd970410756cedf6c96f18abc3170726':
fixed Datasets braces
added self to contributors
renamed containers in docker-compose.yml for Ubuntu Docker compatibility
added file_id and content nodes to @context for user added JSON-LD metadata
revised error text to indicate empty model and likely problem
trait must be class instead..
Added a JSON-LD RDFModel reader from JsValue (for validation) Test read of RDFModel from JSON body at 3 JSON-LD endpoints Added Apache Jena dependency
trait must be class instead..
Added a JSON-LD RDFModel reader from JsValue (for validation) Test read of RDFModel from JSON body at 3 JSON-LD endpoints Added Apache Jena dependency -
Indira Gutierrez Polo f35d5a1fb2cf74aa573410bc05b98366948c6b6c m
Adding Breadcrumbs to the submitted Curation Object Page
-
Jim Myers e2755ba550c2dc13cb77f3377d3c0d3c0650c36d m
updated in all 3 places to work when sharing is enabled
-
Jim Myers 4f87e38bb1c62380c3a3d46c5ebd526bc8ccaf73 m
making this all work when space sharing is enabled per Indira's review comment.
-
Indira Gutierrez Polo 4e6cb2013a3b623a2643264f4a5be60adfaeaba4 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/SEAD-1025-add-breadcrumb-navigation
# Conflicts:
# app/controllers/Datasets.scala
# app/views/datasetList.scala.html -
Indira Gutierrez Polo a722ba9afdc402f53e15cc07064cbc6953785094 m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into feature/SEAD-1025-add-breadcrumb-navigation
# Conflicts:
# app/controllers/Datasets.scala
# app/views/datasetList.scala.html -
Jim Myers 63c045a9959b15e96f3d27d71c8f3725f8285a49 m
Merge pull request #7 in ~JIMMYERS/clowder from CATS/clowder:develop to develop
* commit 'f916828eb77a1ea9c4345c9cddd613e63487b1ee': (82 commits)
Replaced a few more tents icons with hard drive icons. Remove/added a few periods in a few places to be consistent. Made the private/public text for a space a label and the request access button a link.
changed icon from tent to hard drive for spaces
make sure the code is backwards compatible.
make sure to parse timezone in timestamp
Show appropriate message when a folder is empty or after deleting the last file / folder from a folder
remove access count
1. Updated text Users in home page 2. Added texts Users and user to messages for i18n
Fixed typo in collection page
shows all public datasets independently of all datasets, new 'public' call instead of filtering the 'all datasets'
disable pluggin
remove comments/logger
remove to
change permissions on anonymous and private space, change request messages
fix test
fix test
remove it entirely
remove it entirely
fix test
homepage access spaces number
file is not part of a dataset see https://clowder-dev.ncsa.illinois.edu/clowder/files/55e46a97e4b08612a9c0dd94
... -
Luigi Marini f916828eb77a1ea9c4345c9cddd613e63487b1ee m
Replaced a few more tents icons with hard drive icons. Remove/added a few periods in a few places to be consistent. Made the private/public text for a space a label and the request access button a link.
- app/views/collectionofdatasets.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/curations/newCuration.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/dataset.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/datasets/create.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/extractions/submitFileExtraction.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/file.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/manageMetadataDefinitions.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/newCollection.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/access.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/curationObjectsBySpace.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/newEditTemplate.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/requestAuthorization.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/space.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/stagingarea.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/updateExtractors.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
- app/views/spaces/users.scala.html (version f916828eb77a1ea9c4345c9cddd613e63487b1ee) (diffs)
-
Luigi Marini c3d047b7220af0963d6e02c37090a5917fcdf43a m
Merge branch 'develop' into feature/SEAD-1036-include-public-and-published-content
# Conflicts:
# app/services/mongodb/MongoDBCurationService.scala
# app/views/spaces/space.scala.html -
Indira Gutierrez Polo 03ea4cd40c6e86ec3fc1bbc672517099c2a61406 m
Adding breadcrumbs on spacesList
-
Indira Gutierrez Polo 0367aee4d751afd152d35cc3f95f28cf8f6ab22a m
Adding breadcrumbs on collectionList
-
Indira Gutierrez Polo a82f41cebd90c5a169af954448aacaeff121fda3 m
Adding breadcrumbs on datasetList, createStep2 and addFiles to Dataset pages
- app/controllers/Datasets.scala (version a82f41cebd90c5a169af954448aacaeff121fda3) (diffs)
- app/controllers/Folders.scala (version a82f41cebd90c5a169af954448aacaeff121fda3) (diffs)
- app/views/dataset.scala.html (version a82f41cebd90c5a169af954448aacaeff121fda3) (diffs)
- app/views/datasetList.scala.html (version a82f41cebd90c5a169af954448aacaeff121fda3) (diffs)
- app/views/datasets/addFiles.scala.html (version a82f41cebd90c5a169af954448aacaeff121fda3) (diffs)
- app/views/datasets/createStep2.scala.html (version a82f41cebd90c5a169af954448aacaeff121fda3) (diffs)
-
Max Burnette <mburnet88@gmail.com> 8b2c09143b40eb334a6ee03715871866d1960336 m
Merge branch 'develop' into overhaul-elasticsearch
# Conflicts:
# app/services/mongodb/MongoDBMetadataService.scala -
Max Burnette <mburnet88@gmail.com> aa65c9a714e205c8466162507599b1506678f806 m
Merge branch 'develop' into overhaul-elasticsearch
# Conflicts:
# app/services/mongodb/MongoDBMetadataService.scala -
Indira Gutierrez Polo d1e3d8939f0d820f5b459d07f6fdecdc3c198184 m
rollback.
-
Indira Gutierrez Polo d9808ea1848167e3411dab59d7d8f99b7fa4a65f m
Setting up to return datapoints if there are strings (not only doubles values)
-
Luigi Marini 16ef56ab59afc8c4fb1a3e87a3f39a0f13780738 m
Merge branch 'release/1.0' into develop
# Conflicts:
# app/controllers/Application.scala
# app/views/file.scala.html -
Gregory Jansen <gregory.jansen@gmail.com> af61a434bd970410756cedf6c96f18abc3170726 m
fixed Datasets braces
-
Gregory Jansen <gregory.jansen@gmail.com> 53746a3af66574715dc6049a393958caf01533b0 m
merged changes into feature blocks that were different
-
Luigi Marini b4cf6aaa4c71f6dfb3f628d867211a1254f6703c m
Merge pull request #883 in CATS/clowder from bugfix/CATS-566-filter-api-metadata-get-by-extractor-name to develop
* commit '1c28446a74fb7998db6590091b301921646274a8':
Change method name; fix count updates
Move md count adjustment & RMQ message outside Salat/MdService
Fix extractor message to be consistent
Properly update & return md counts on remove
Remove unneeded Option
Change InternalServerError to BadRequest
Filter at mongo query for Files as well
Perform extractor filter in Mongo query
Clean up filtering logic on metadata query
Avoid unnecessary regex with extractor filter match
Fix typo in file metadata removal path
Change extractor filter to Option[String]
Add API path to remove metadata by attached ID and extractor
Explicitly pass extractor filter to method, simplify code
Return empty list, not list with one empty JSON object
Return empty object if extractor not found in md
Add filter to metadata JsonLD API endpoints -
Luigi Marini 893922fc797c48c4d5bac80d58c73aa06fa462ed m
Merge pull request #985 in CATS/clowder from feature/CATS-600-manual-submission-of-dataset-to to develop
* commit '6d59e4d1d88496075d7cff6f4fdddc792623b9ef':
Fix extractions test
Disable manual extractions if no RMQ
Remove DTS on datasets, send dID to RMQ
Add support for manual extraction on datasets -
Jim Myers d4a31cd4c77d9ec852e3c6b2ec448ca1e7ad27e0 m
make listPossibleParents pass partial titles forward to underlying call to list collections (also add pasting of date - this appears to always be None in current uses, but if sent, it should be used...)
also lowered the limit for # of possible parents to 5 to match # of
spaces shown in other pick lists) ( be good to make them all bigger, but
this will make them consistent for now)
also globally fixed minor typo - lisCollections --> listCollections -
Michal Ondrejcek 5993865a8d4a545cce97812e1fcff5b1bdc18664 m
shows all public datasets independently of all datasets, new 'public' call instead of filtering the 'all datasets'
- app/controllers/SecuredController.scala (version 5993865a8d4a545cce97812e1fcff5b1bdc18664) (diffs)
- app/controllers/Spaces.scala (version 5993865a8d4a545cce97812e1fcff5b1bdc18664) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version 5993865a8d4a545cce97812e1fcff5b1bdc18664) (diffs)
- app/views/spaces/space.scala.html (version 5993865a8d4a545cce97812e1fcff5b1bdc18664) (diffs)
-
Michal Ondrejcek a064f30ed9b357536947dce1cdab3d3261d3ff7c m
disable pluggin
-
Michal Ondrejcek fa5187852dac4b1eedb0ebcb30efb37b11a9d100 m
remove comments/logger
- app/controllers/Datasets.scala (version fa5187852dac4b1eedb0ebcb30efb37b11a9d100) (diffs)
- app/controllers/SecuredController.scala (version fa5187852dac4b1eedb0ebcb30efb37b11a9d100) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version fa5187852dac4b1eedb0ebcb30efb37b11a9d100) (diffs)
- conf/play.plugins (version fa5187852dac4b1eedb0ebcb30efb37b11a9d100) (diffs)
-
Michal Ondrejcek 673915072ca5481058ce601c6d553ae52acb1779 m
change permissions on anonymous and private space, change request messages
- app/api/Permissions.scala (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/controllers/Datasets.scala (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/controllers/SecuredController.scala (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/services/DatasetService.scala (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/views/spaces/access.scala.html (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/views/spaces/curationObjectsBySpace.scala.html (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/views/spaces/curationObjectsGrid.scala.html (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/views/spaces/datasetsBySpace.scala.html (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- app/views/spaces/space.scala.html (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
- conf/play.plugins (version 673915072ca5481058ce601c6d553ae52acb1779) (diffs)
-
Jim Myers db18d04e08c373ca495b0293b8dcb7a9e264e107 m
stop duplicate entries when doing a cycle of docker-compose up/down
-
Michal Ondrejcek 76f730ba0f73738846d4cd6f4073272b0c7e0571 m
Merge branch 'develop' into feature/SEAD-1036-include-public-and-published-content
-
Jim Myers 76055c74ce791f8ff9474b256d72241b1e2b9ba0 m
Use the 'disabled' class to turn the publish link on/off
when the dataset is added to a space or removed from the last space. The
only visual difference from the prior code is that, in the disabled
state, the no cursor doesn't appear on hover -
Jim Myers 3b7f42748e7161feba09f2a1932acda5ca8c3d09 m
Moving tags/keywords from OREMap itself to the Aggregation it 'describes'
-
Jim Myers 144eca36e97a135d54f866ad7268bea8b2517110 m
Metadata context popups had a race condition - if the mouse left the element before the ajax call returned a value, the 'hide' call occurred before the 'show' and the popup stayed up. This fix adds a class 'popping' when the mouseover triggers the popup. Mouse out remove the class and, if the ajax call returns after the class has been removed, the popup is only flashed up briefly. Otherwise, it works as intended and the popup remains until a mouse out.
-
Jim Myers 8583d89a4f6e81dabd84c5aecf95e35deafa36d3 m
Merge pull request #2 in ~JIMMYERS/clowder from CATS/clowder:develop to develop
* commit 'fe6c7e76a54dab0d8ef41917666ada58e8ca1e4d': (24 commits)
open in a new tab
remove link
change key value
Adding Publishing Project Name to publication request to C3PR
When there is just one space use spaces.head instead of map. In dataset, collection and file page. Add case None in controllers/files missing. Added comments about decodedDatasets and AllDecodedDatasets in controllers/files Added comment about the user in the new curation object page. Added Breadcrumb on Submit File for extraction Fixed Breadcrumb on space/extractor from div to ol
comment
publishData.list.uri
Removing delete-all endpoint
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1025-add-breadcrumb-navigation
Using <ol class="breadcrumb"></ol> and <li> for each breadcrumb item.
Using <div class="breadcrumb"></div> instad of h4. Using ellipsize on titles
Using breadcrumb css style and ellipsize method to make the breadcrumbs on the file page more compact.
comment
have to reach all publish data then decide who is the first
publish data
Removing Project Space: spaceName from the staging area and the manage metadata (within space) page
publish data
fake page
When there is no space selected add user on the breadcrumbs for: - Dataset Page - Collection Page - File Page - Create Dataset Page - Create Collection page - Create Space Page - Edit Space page - Create/Edit Curation Object
first code
... -
Max Burnette <mburnet88@gmail.com> 6d59e4d1d88496075d7cff6f4fdddc792623b9ef m
Merge branch 'develop' into feature/CATS-600-manual-submission-of-dataset-to
# Conflicts:
# app/controllers/Extractors.scala -
Michal Ondrejcek 2e718d85dfb2b84e5d332761ba5cbc20cee91a3c m
add public flag to the space layout
-
Yan Zhao fe6c7e76a54dab0d8ef41917666ada58e8ca1e4d m
open in a new tab
-
Yan Zhao 5c796309f78a1868471bd214fb414edf3b1dc208 m
remove link
-
Yan Zhao 509c1a898cdec7352fbe4b6639602f4c2a76d0e3 m
change key value
-
Michal Ondrejcek b843d2e1e44fd460c3ac038be715e8352fe3f9ed m
conflict resolved, permissions
-
Michal Ondrejcek 76662ae5fc839f54879a801973a2463953f0a8a1 m
Removed debugging comments
-
Michal Ondrejcek c79f2280ea332c06f3bda256b7ebf94d23fb6071 m
Published curation objects have the same permissions as Staging area
-
Michal Ondrejcek 1e5870bb4dba89078225de77729a66d4b2de945f m
Make the Dataset and Collection list layout exactly the same as Space list.
-
Michal Ondrejcek 8105c559b027bf829249f08bb6c662600b0771b6 m
Fix pagination in All datasets
-
Michal Ondrejcek e6cad34d56cbfd001d9e3a465f6840ad67ffe52d m
Public dataset pagination added
- app/controllers/Datasets.scala (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- app/services/DatasetService.scala (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- app/views/datasetList.scala.html (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- app/views/home.scala.html (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- app/views/spaces/datasetsBySpace.scala.html (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
- conf/routes (version e6cad34d56cbfd001d9e3a465f6840ad67ffe52d) (diffs)
-
Michal Ondrejcek a3a93cf9a33fdedc5bb1aa85009060fcfa1afe6c m
Show only collections from public space, change dataset to curation object in a tab
- app/views/curationObjectList.scala.html (version a3a93cf9a33fdedc5bb1aa85009060fcfa1afe6c) (diffs)
- app/views/spaces/curationObjectsBySpace.scala.html (version a3a93cf9a33fdedc5bb1aa85009060fcfa1afe6c) (diffs)
- app/views/spaces/space.scala.html (version a3a93cf9a33fdedc5bb1aa85009060fcfa1afe6c) (diffs)
-
Luigi Marini 0eb7dea3f0c98b64ba18a447da577a0b1995bdc7 m
Merge pull request #1005 in CATS/clowder from feature/SEAD-1080-list-of-all-data-published-through to develop
* commit '41e5bca0cfd9454f104de826defd8ae135dcb4b4':
Adding Publishing Project Name to publication request to C3PR
comment
publishData.list.uri
comment
have to reach all publish data then decide who is the first
publish data
publish data
fake page
first code -
Indira Gutierrez Polo 41e5bca0cfd9454f104de826defd8ae135dcb4b4 m
Adding Publishing Project Name to publication request to C3PR
-
Luigi Marini ac77c8a0bc6b49e97955e71f5f19c1f73545ce69 m
Merge pull request #1024 in CATS/clowder from bugfix/CATS-652-remove-delete-all-api-endpoint to develop
* commit '6c4f79c3dc4495ec1f6795943a350b7d99e569f7':
Removing delete-all endpoint -
Indira Gutierrez Polo a7cd0a29628c905c2cd69118d6605e9dd8b24673 m
When there is just one space use spaces.head instead of map. In dataset, collection and file page. Add case None in controllers/files missing. Added comments about decodedDatasets and AllDecodedDatasets in controllers/files Added comment about the user in the new curation object page. Added Breadcrumb on Submit File for extraction Fixed Breadcrumb on space/extractor from div to ol
- app/controllers/Extractors.scala (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/controllers/Files.scala (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/collectionofdatasets.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/curations/newCuration.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/dataset.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/extractions/submitExtraction.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/file.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/manageMetadataDefinitions.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
- app/views/spaces/updateExtractors.scala.html (version a7cd0a29628c905c2cd69118d6605e9dd8b24673) (diffs)
-
Michal Ondrejcek 4dbacae5ec728743758490260c03fb6c9751e2d9 m
added pagination on CurationObjects
- app/controllers/CurationObjects.scala (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/services/CurationService.scala (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/services/mongodb/MongoDBCurationService.scala (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/curationObjectList.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/curations/listitem.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/curations/tile.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/spaces/curationObjectsBySpace.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/spaces/curationObjectsGrid.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- app/views/spaces/space.scala.html (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
- conf/routes (version 4dbacae5ec728743758490260c03fb6c9751e2d9) (diffs)
-
Max Burnette <mburnet88@gmail.com> 04c306e7da48c520eeb922d2b70948ad61528544 m
Several typo fixes + code improvements
-
Yan Zhao 506341908321b8216a27943d98df84913f15c840 m
comment
-
Yan Zhao cb57a1cd6afd12c56a5da04c0f14361a3c3596ed m
publishData.list.uri
- app/controllers/CurationObjects.scala (version cb57a1cd6afd12c56a5da04c0f14361a3c3596ed) (diffs)
- app/controllers/Spaces.scala (version cb57a1cd6afd12c56a5da04c0f14361a3c3596ed) (diffs)
- app/models/Dataset.scala (version cb57a1cd6afd12c56a5da04c0f14361a3c3596ed) (diffs)
- app/models/Space.scala (version cb57a1cd6afd12c56a5da04c0f14361a3c3596ed) (diffs)
- app/views/curations/publishedData.scala.html (version cb57a1cd6afd12c56a5da04c0f14361a3c3596ed) (diffs)
- conf/application.conf (version cb57a1cd6afd12c56a5da04c0f14361a3c3596ed) (diffs)
-
Indira Gutierrez Polo 6c4f79c3dc4495ec1f6795943a350b7d99e569f7 m
Removing delete-all endpoint
-
Michal Ondrejcek d19342cc4caab0b10736054a6654bb9f41943cad m
add list of curation objects, new templates for curation objects
- app/controllers/CurationObjects.scala (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/controllers/SecuredController.scala (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/controllers/Spaces.scala (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/models/Collection.scala (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/services/CurationService.scala (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/services/mongodb/MongoDBCurationService.scala (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/curations/tile.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/access.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/collectionsBySpace.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/collectionsGrid.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/curationObjectsBySpace.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/curationObjectsGrid.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/datasetsBySpace.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/datasetsGrid.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/externalLinks.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/otherActions.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/publicView.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/space.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
- app/views/spaces/statistics.scala.html (version d19342cc4caab0b10736054a6654bb9f41943cad) (diffs)
-
Jim Myers 842206167133fe0ae8c1a524cf4c26d9dd4b5f21 m
escaped quote chars not needed in download Content DISPOSITION - they break transmission of the filename: api.Files.download did it correctly
-
Indira Gutierrez Polo e29df48c21e294d36aeb541737c85a0e72ff4f5f m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1025-add-breadcrumb-navigation
# Conflicts:
# app/views/manageMetadataDefinitions.scala.html
# app/views/spaces/space.scala.html -
Indira Gutierrez Polo 8f14f90aae6b5dcdda554ad0174aa164aa8d641a m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/stash/scm/cats/clowder into bugfix/SEAD-1025-add-breadcrumb-navigation
# Conflicts:
# app/views/manageMetadataDefinitions.scala.html
# app/views/spaces/space.scala.html -
Indira Gutierrez Polo f8a8b59bbba98804cd3d0c0a3e41cfbd72376125 m
Using <ol class="breadcrumb"></ol> and <li> for each breadcrumb item.
- app/views/collectionofdatasets.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/collections/users.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/curations/newCuration.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/dataset.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/datasets/create.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/datasets/users.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/file.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/manageMetadataDefinitions.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/newCollection.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/newCollectionWithParent.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/spaces/newEditTemplate.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/spaces/space.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/spaces/stagingarea.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- app/views/spaces/users.scala.html (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
- public/stylesheets/themes/sead.min.css (version f8a8b59bbba98804cd3d0c0a3e41cfbd72376125) (diffs)
-
Indira Gutierrez Polo 3409eff8085bfcccd443ff43f11454be978fb4e0 m
Using <div class="breadcrumb"></div> instad of h4. Using ellipsize on titles
- app/views/collectionofdatasets.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/curations/newCuration.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/dataset.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/datasets/create.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/manageMetadataDefinitions.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/newCollection.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/newCollectionWithParent.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/spaces/newEditTemplate.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/spaces/stagingarea.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/spaces/updateExtractors.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
- app/views/spaces/users.scala.html (version 3409eff8085bfcccd443ff43f11454be978fb4e0) (diffs)
-
Luigi Marini c80baabb9c7e894588b4ade315550513c4f63319 m
Using breadcrumb css style and ellipsize method to make the breadcrumbs on the file page more compact.
-
Michal Ondrejcek 3f0d892a4b058dcc90a584ab3b14748dc2647813 m
Merge branch 'develop' into feature/SEAD-1036-include-public-and-published-content
-
Luigi Marini b6d859cbc581fb5c3d781baa730cc17fa66d60f1 m
Merge pull request #996 in CATS/clowder from feature/SEAD-1089-alert-users-to-comments-on-items to develop
* commit '3cd2abd9f831ca552e2758663b363a5a3209fb7f':
spaceIdList = user.spaceandrole
spaceIdList = user.spaceandrole
view commet
datasets with AddComment permission
Update app/services/mongodb/MongoDBEventService.scala
event contains the comment
event contains the comment
event contains the comment -
Luigi Marini 1391e18e063a9b4edb933e309425e190401d1fb6 m
Merge pull request #1003 in CATS/clowder from feature/SEAD-1065-interface-improvement-to-matchmaker to develop
* commit 'ef7b2b332b051fe8c4e5b0e3f29908a9c1780771':
Removing comment from main.css Updating the match on update button.
Changing class green to green-background
Fixing alignment on matchmaker page. -
Michal Ondrejcek 89d1a0303cf9d2d829e204e40573aead474231c1 m
merge conflict
-
Indira Gutierrez Polo ef7b2b332b051fe8c4e5b0e3f29908a9c1780771 m
Removing comment from main.css Updating the match on update button.
