Code commits
clowder
-
Todd Nicholson 5c6327259c42e2b76bd11a1274e28bea65ca705c
New Tree view as a tab in home page to navigate resources as a hiearchical tree (spaces, collections, datasets, folders and files). The tree is lazily loaded using a new endpoint `api/tree/getChildrenOfNode`.
- CHANGELOG.md (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- app/api/Tree.scala (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- app/controllers/Application.scala (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- app/services/TreeService.scala (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- app/views/home.scala.html (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- conf/routes (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/jstree.js (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/jstree.min.js (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default-dark/32px.png (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default-dark/40px.png (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default-dark/style.css (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default-dark/style.min.css (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default-dark/throbber.gif (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default/32px.png (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default/40px.png (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default/style.css (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default/style.min.css (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
- public/javascripts/jstree/themes/default/throbber.gif (version 5c6327259c42e2b76bd11a1274e28bea65ca705c) (diffs)
-
Luigi Marini 78d815f48955b22ad48098d94368898f09a37614
Updated CHANGELOG for 1.8 release.
-
Luigi Marini 13b35cf027d9cb65bde56d0d886710f54f382ef5
Updated CHANGELOG for 1.8 release.
-
Luigi Marini d7a2c0532e868a2b0f2dda09381ea825bbe89dc5
Cleaned up extractors pages. Added padding to footer so that it is not as crammed and superadmin warning bottom bar does not cover buttons.
- app/views/datasets/addFiles.scala.html (version d7a2c0532e868a2b0f2dda09381ea825bbe89dc5) (diffs)
- app/views/listAllExtractions.scala.html (version d7a2c0532e868a2b0f2dda09381ea825bbe89dc5) (diffs)
- app/views/main.scala.html (version d7a2c0532e868a2b0f2dda09381ea825bbe89dc5) (diffs)
- app/views/spaces/updateExtractors.scala.html (version d7a2c0532e868a2b0f2dda09381ea825bbe89dc5) (diffs)
- app/views/updateExtractors.scala.html (version d7a2c0532e868a2b0f2dda09381ea825bbe89dc5) (diffs)
- public/stylesheets/main.css (version d7a2c0532e868a2b0f2dda09381ea825bbe89dc5) (diffs)
-
Luigi Marini 6f5f3492605d6399c02985301533c460d9df16d9
Added a max of 100 status messages on the page listing all extractions. Before trying to list all extractions in the system was causing the JVM to run out of memory. The link to the page in the admin menu was remove, but the page is still there for future improvements.
- CHANGELOG.md (version 6f5f3492605d6399c02985301533c460d9df16d9) (diffs)
- app/services/ExtractionService.scala (version 6f5f3492605d6399c02985301533c460d9df16d9) (diffs)
- app/services/mongodb/MongoDBExtractionService.scala (version 6f5f3492605d6399c02985301533c460d9df16d9) (diffs)
- app/views/listAllExtractions.scala.html (version 6f5f3492605d6399c02985301533c460d9df16d9) (diffs)
- app/views/main.scala.html (version 6f5f3492605d6399c02985301533c460d9df16d9) (diffs)
-
Luigi Marini 31e4b942a9f2c90a14bd8d857ad12a15b784aee5
Merge pull request #1407 in CATS/clowder from bugfix/CATS-1030-page-size-for-dataset-listing-sets-the-wrong-url-parameter to release/1.8
* commit '3fdef996550dfac4d7df97a97d8c8a9c80fbd32c':
Fixed bug where changing the page size on dataset, collection, space listings would not properly update elements visible on the page. -
Luigi Marini 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c
Fixed bug where changing the page size on dataset, collection, space listings would not properly update elements visible on the page.
- CHANGELOG.md (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
- app/controllers/Datasets.scala (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
- app/views/collectionList.scala.html (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
- app/views/datasetList.scala.html (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
- app/views/spaces/listSpaces.scala.html (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
- conf/routes (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
- public/javascripts/displayPanels.js (version 3fdef996550dfac4d7df97a97d8c8a9c80fbd32c) (diffs)
-
Luigi Marini 50900ca69189e3c244f8e9553ac3c8d1f928c4f6
Merge pull request #1409 in CATS/clowder from bugfix/CATS-1031-mini-icons-for-resources-on-list-views-create-too-much-vertical-space to release/1.8
* commit '6fa0362699d4f801b85f5b44e54023f511bdba4a':
Removed mini icons on tiles for spaces, datasets, collections and files for resources on list views. -
Luigi Marini 6fa0362699d4f801b85f5b44e54023f511bdba4a
Removed mini icons on tiles for spaces, datasets, collections and files for resources on list views.
- CHANGELOG.md (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/collectionList.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/collections/listitem.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/collections/tile.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/datasets/listitem.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/files/listitem.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/spaces/listItem.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
- app/views/spaces/tile.scala.html (version 6fa0362699d4f801b85f5b44e54023f511bdba4a) (diffs)
-
Luigi Marini 782001464f30aa57d4ab5de7c8ef028f585e729c
Changed how pagination controls are layed out so that they are now vertically aligned.
- CHANGELOG.md (version 782001464f30aa57d4ab5de7c8ef028f585e729c) (diffs)
- app/views/collectionList.scala.html (version 782001464f30aa57d4ab5de7c8ef028f585e729c) (diffs)
- app/views/datasetList.scala.html (version 782001464f30aa57d4ab5de7c8ef028f585e729c) (diffs)
- app/views/spaces/listSpaces.scala.html (version 782001464f30aa57d4ab5de7c8ef028f585e729c) (diffs)
- public/stylesheets/main.css (version 782001464f30aa57d4ab5de7c8ef028f585e729c) (diffs)
-
Rob Kooper 656d38fc13d3b32a99cab11021101476c3108059
gui for monitor docker container
- CHANGELOG.md (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/Dockerfile (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/bootstrap-table.min.css (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/bootstrap-table.min.js (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/bootstrap.min.css (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/bootstrap.min.js (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/extractors.json (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/fa-solid-900.woff2 (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/favicon.png (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/fontawesome.min.css (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/index.html (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/jquery-3.3.1.min.js (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/monitor.py (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/popper.min.js (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/requirements.txt (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
- scripts/monitor/solid.min.css (version 656d38fc13d3b32a99cab11021101476c3108059) (diffs)
-
Rob Kooper 479b576e7a14a70774efb94abfc228b43db764ab
bamboo uses ash (I think) and does not understand bash ==
-
Luigi Marini c6042de715da19134fdc29b68633ebe767a4137b
Updated version and cleaned up CHANGELOG.
-
Luigi Marini 70d16034b32e3a6e853d71a373bf77ef0266bb1f
Merge pull request #1401 in CATS/clowder from space-invitations-login-page-fix to release/1.8
* commit 'f13586a5e956d37d1917375c888e8019bdb6201d':
Fixed space invitation when a user is not a member of the instance and local userpass is not enabled. -
Max Burnette <mburnet2@illinois.com> f13586a5e956d37d1917375c888e8019bdb6201d m
Fixed space invitation when a user is not a member of the instance and local userpass is not enabled.
- CHANGELOG.md (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
- app/controllers/Registration.scala (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
- app/services/SecureSocialEventListener.scala (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
- app/services/SpaceService.scala (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
- app/views/inviteThroughEmail.scala.html (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
- conf/routes (version f13586a5e956d37d1917375c888e8019bdb6201d) (diffs)
-
Rob Kooper 879b7e2a9dd1a3afe87d55b00d9ef0f7bb8aae98
Merge remote-tracking branch 'origin/release/1.8' into release-174-to-release-180
-
Luigi Marini 489831459dad3733d9ebbf7518b3701aad442d2b m
Merge pull request #1393 in CATS/clowder from elasticsearch-process-queue to develop
* commit '71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2':
Use a queue (backed by default by MongoDB) to reindex the full Elasticsearch index. -
Max Burnette <mburnet2@illinois.com> 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2 m
Use a queue (backed by default by MongoDB) to reindex the full Elasticsearch index.
- CHANGELOG.md (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/api/Admin.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/api/Collections.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/api/Datasets.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/api/Files.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/api/Status.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/models/QueuedAction.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/CollectionService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/DatasetService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/ElasticsearchPlugin.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/FileService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/mongodb/ElasticsearchQueue.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
- app/services/mongodb/MongoDBQueueService.scala (version 71f0a8da8f8645d5eda2ff0c0ceb9dfed3a14ac2) (diffs)
-
Luigi Marini 7e8d0b2bcb18008e060227356f1883ad4410cc3a m
Merge pull request #1398 in CATS/clowder from bugfix/CATS-1025-reporting-api-times-out-on-large-databases to develop
* commit '88f4bcdba982328be273bd9db88cfee9e2b7cf39':
Stream Files, Datasets and Collections reports in chunks. -
Max Burnette <mburnet2@illinois.com> 88f4bcdba982328be273bd9db88cfee9e2b7cf39 m
Stream Files, Datasets and Collections reports in chunks.
- CHANGELOG.md (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/api/Datasets.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/api/Reporting.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/services/CollectionService.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/services/DatasetService.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/services/FileService.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 88f4bcdba982328be273bd9db88cfee9e2b7cf39) (diffs)
-
Luigi Marini 2265f34cdff6b8f2e0f005d1fdf181a230df0da3 m
Merge pull request #1399 in CATS/clowder from fix-monitor to develop
* commit '263fbfecbd55d2a40dc6d977d9fa71c00afb82e4':
make monitor less verbose, use correct monitor image in docker-compose file. -
Rob Kooper 1ede23a4645bd6faf89b085331bd5c585ee25cf1 m
small tweaks for deploying in kubernetes
build/push check program
fix removal of consumer from list in monitor- docker.sh (version 1ede23a4645bd6faf89b085331bd5c585ee25cf1) (diffs)
- release.sh (version 1ede23a4645bd6faf89b085331bd5c585ee25cf1) (diffs)
- scripts/check/Dockerfile (version 1ede23a4645bd6faf89b085331bd5c585ee25cf1) (diffs)
- scripts/monitor/monitor.py (version 1ede23a4645bd6faf89b085331bd5c585ee25cf1) (diffs)
-
Rob Kooper 263fbfecbd55d2a40dc6d977d9fa71c00afb82e4 m
make monitor less verbose, use correct monitor image in docker-compose file.
-
Rob Kooper 8735058bd04cf9ca9a83f6c6b8e8412fc6302816 m
Support for mongo 3.6. Changed aggregators to mongo find and loops in scala.
Added two scripts that can be used to check if rabbitmq and/or mongodb is up and running and accepting connections.- CHANGELOG.md (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- app/services/DatasetService.scala (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- app/services/mongodb/MongoDBSectionService.scala (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- app/services/mongodb/MongoDBUserService.scala (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- app/services/mongodb/MongoSalatPlugin.scala (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- docker-compose.yml (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- scripts/check/Dockerfile (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- scripts/check/check_mongodb (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- scripts/check/check_rabbitmq (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
- scripts/check/requirements.txt (version 8735058bd04cf9ca9a83f6c6b8e8412fc6302816) (diffs)
-
Max Burnette <mburnet2@illinois.com> 042611661a761cf443098bdbcfd785925655e9b2 m
Utilize bulk get methods for resources widely across the application, including checking permissions for many resources at once. Several instances where checks for resource existince were being done multiple times (e.g. in a method and then in another method the first one calls) to reduce MongoDB query load. These bulk requests will also report any missing IDs in the requested list so developers can handle those appropriately if needed.
- CHANGELOG.md (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/Iterators/CollectionIterator.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/Iterators/DatasetIterator.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/Iterators/RootCollectionIterator.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Collections.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Datasets.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Extractions.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Files.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Folders.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Permissions.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Search.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/api/Spaces.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/controllers/Application.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/controllers/Collections.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/controllers/CurationObjects.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/controllers/Datasets.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/controllers/Extractors.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/controllers/Files.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/models/SearchResultFile.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/models/SearchResultPreview.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/models/SearchResults.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/CollectionService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/CommentService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/DatasetService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/ElasticsearchPlugin.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/FileService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/FolderService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/PreviewService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/SectionService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/SpaceService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/fourstore/FourStoreRdfSPARQLService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBCommentService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBFolderService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBSectionService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBSelectionService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/services/mongodb/MongoDBSpaceService.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
- app/util/SearchUtils.scala (version 042611661a761cf443098bdbcfd785925655e9b2) (diffs)
-
Sara Lambert 6ec86e4e0094381b9482ff87c0fa44ca3f893e7b m
Expanded ExtractorInfo to include a 'parameters' field containing JSONSchema, generate a 'parameters' form in the manual submission view(s) from the JSONSchema provided
- CHANGELOG.md (version 6ec86e4e0094381b9482ff87c0fa44ca3f893e7b) (diffs)
- app/models/Extraction.scala (version 6ec86e4e0094381b9482ff87c0fa44ca3f893e7b) (diffs)
- app/views/extractions/submitDatasetExtraction.scala.html (version 6ec86e4e0094381b9482ff87c0fa44ca3f893e7b) (diffs)
- app/views/extractions/submitFileExtraction.scala.html (version 6ec86e4e0094381b9482ff87c0fa44ca3f893e7b) (diffs)
-
Rob Kooper 53f9b3728a2391f56551e196ba4effeb3940f061 m
traefik:latest is now v2 which is not compatible with docker-compose
-
Rob Kooper d4d31d11de002435645f5f0904fc3a03f486f413 m
docker-compose updates - extractors are now in their own docker-compose file - added traefik for proxy - added monitor - use env file for options - fix to run as arbitrary user (needed for openshift) - move monitor from pyclowder
- .gitignore (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- CHANGELOG.md (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- Dockerfile (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- README.md (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- docker-compose.extractors.yml (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- docker-compose.override.example.yml (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- docker-compose.yml (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- docker.sh (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- docker/clowder.sh (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- docker/custom.conf (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- env.example (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- release.sh (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- scripts/monitor/Dockerfile (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
- scripts/monitor/monitor.py (version d4d31d11de002435645f5f0904fc3a03f486f413) (diffs)
-
Luigi Marini af562f8a89a81087b8021709a3f73206e4b34bbf m
Merge pull request #1388 in CATS/clowder from feature/CATS-1010-add-pagination-to-search-box-results to develop
* commit '81c13d1944c83a3d7678591ea88aa929806293e4':
Added pagination and infinite scrolling to search. Added thumbnail API route. -
Max Burnette <mburnet2@illinois.com> 81c13d1944c83a3d7678591ea88aa929806293e4 m
Added pagination and infinite scrolling to search. Added thumbnail API route.
- CHANGELOG.md (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/api/Search.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/controllers/Search.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/models/Collection.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/models/Dataset.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/models/ElasticSearchObject.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/models/File.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/services/ElasticsearchPlugin.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/util/SearchUtils.scala (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/views/metadatald/search.scala.html (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- app/views/searchResults.scala.html (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- conf/routes (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- public/swagger.yml (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
- public/templates/metadata/search_collection_result.handlebars (version 81c13d1944c83a3d7678591ea88aa929806293e4) (diffs)
-
Rob Kooper 3a064c7776299e315a30d63688b79d83d9b2a343 m
Docker cleanup - use new buildkit to speed up builds -- use caches -- parallel builds - use build args for version/branch/git - store version/branch/git as environment variables in docker image
Updated changelog.- CHANGELOG.md (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
- Dockerfile (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
- docker.sh (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
- project/Build.scala (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
- release.sh (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
- scripts/mongo-init/Dockerfile (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
- scripts/toollaunchservice/Dockerfile (version 3a064c7776299e315a30d63688b79d83d9b2a343) (diffs)
-
Sara Lambert 86336edf4cdcc8ee5be09c432080acef10b73220 m
Trigger archival process automatically based on when a file was last viewed/downloaded and the size of the file.
- CHANGELOG.md (version 86336edf4cdcc8ee5be09c432080acef10b73220) (diffs)
- app/Global.scala (version 86336edf4cdcc8ee5be09c432080acef10b73220) (diffs)
- app/api/Files.scala (version 86336edf4cdcc8ee5be09c432080acef10b73220) (diffs)
- app/services/FileService.scala (version 86336edf4cdcc8ee5be09c432080acef10b73220) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 86336edf4cdcc8ee5be09c432080acef10b73220) (diffs)
- conf/application.conf (version 86336edf4cdcc8ee5be09c432080acef10b73220) (diffs)
-
Luigi Marini ce6485371f68713fdd76a91d9b31c1f097891ef2 m
Merge pull request #1374 in CATS/clowder from CATS-1007-add-button-on-file-page-to-archive-the-file to develop
* commit '9c2697c8df8691af226ed7d7cade0195f5290d43':
Added archive/unarchive button on file page. -
Bing Zhang 9c2697c8df8691af226ed7d7cade0195f5290d43 m
Added archive/unarchive button on file page.
- CHANGELOG.md (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- app/api/Files.scala (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- app/api/Permissions.scala (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- app/controllers/Application.scala (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- app/services/mongodb/MongoSalatPlugin.scala (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- app/views/file.scala.html (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- conf/application.conf (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
- conf/routes (version 9c2697c8df8691af226ed7d7cade0195f5290d43) (diffs)
-
Sara Lambert 5cc54ef364ca0af261d9980f06b39f8eef448bf9 m
Change S3ByteStorageService.save to use TransferManager (note: has odd delay for larger files)
-
Max Burnette <mburnet2@illinois.com> 8ad1298b5adb789f58c2056717870e09bcd1f3be m
add thumbnail UUID to elasticsearch
add full flag to search API
add new /api/thumbnails route
add thumbnails and creation date to file md search results
remove thumb from elasticsearchobject
remove thumbs from SearchUtils
add a bulk search endpoint
update changelog
optimizations to search box querying
remove some unused code
increase max result count & standardize search results display
update swagger doc
update changelog to add new API
add thumbnail API route & change endpoint to blob
fix typo on URL
add logging message for else case- CHANGELOG.md (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/api/Search.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/api/Thumbnail.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/controllers/Application.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/controllers/Search.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/models/Collection.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/models/Dataset.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/models/File.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/CollectionService.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/DatasetService.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/ElasticsearchPlugin.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/FileService.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/views/file.scala.html (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/views/metadatald/search.scala.html (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/views/multimediaSearchResults.scala.html (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/views/multimediaSearchResultsCombined.scala.html (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- app/views/searchResults.scala.html (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- conf/application.conf (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- conf/routes (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- public/swagger.yml (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)
- public/templates/metadata/search_file_result.handlebars (version 8ad1298b5adb789f58c2056717870e09bcd1f3be) (diffs)