Build: #4 was successful Changes by Bing Zhang
Code commits
clowder
-
Bing Zhang 232e76cd8f56519a9f8f426f7f6aba91958c3595
merge conflicts
-
Bing Zhang 9fd79958be087844c7eceebfec3c466001b07ead
merge conflicts
-
Luigi Marini 811ebc47530ba271e28f23bea93700f2d462c891 m
Merge pull request #1426 in CATS/clowder from bugfix/CATS-929-counts-on-home-page-are-off to develop
* commit 'de6abc93536817405aa2b53107a285ca087e8b1c':
CATS-929: Fix one instance of improper counters decrementation in api/Files.removeFile. -
Sara Lambert de6abc93536817405aa2b53107a285ca087e8b1c m
CATS-929: Fix one instance of improper counters decrementation in api/Files.removeFile.
-
Sara Lambert b16b022ff940477192f89ab005e562d5b6f3ba27 m
Include length of file in `FileService` when saving the bytes to any backend service. This helps optimize S3 implementation.
- CHANGELOG.md (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Extractions.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Geometry.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Logos.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Previews.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/ThreeDTexture.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Thumbnail.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/ZoomIt.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/controllers/Files.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/ByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/FileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/LogoService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/PreviewService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/ThreeDService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/ThumbnailService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/TileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/filesystem/DiskByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/irods/IRODSByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBByteStorage.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBLogoService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBThreeDService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBThumbnailService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBTileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/s3/S3ByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/util/FileUtils.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
-
Bing Zhang b180900a15e4d23cd6fd74940d9f443c86da494c m
Script to migrate files on disk to aws s3.
- CHANGELOG.md (version b180900a15e4d23cd6fd74940d9f443c86da494c) (diffs)
- scripts/migrates-aws-s3/Dockerfile (version b180900a15e4d23cd6fd74940d9f443c86da494c) (diffs)
- scripts/migrates-aws-s3/README.md (version b180900a15e4d23cd6fd74940d9f443c86da494c) (diffs)
- scripts/migrates-aws-s3/main.py (version b180900a15e4d23cd6fd74940d9f443c86da494c) (diffs)
- scripts/migrates-aws-s3/requirements.txt (version b180900a15e4d23cd6fd74940d9f443c86da494c) (diffs)
- scripts/migrates-aws-s3/s3.py (version b180900a15e4d23cd6fd74940d9f443c86da494c) (diffs)
-
Todd Nicholson 3b25f131814d5ed252e47ae85170373bed488714 m
Increased sbt version from 0.13.0 to 0.13.6.
-
Sara Lambert bdb2e14a67781e9d6b8016ba59502ff34d13cb78 m
Distribute S3 uploads into a folder structure with configurable depth.
-
Luigi Marini a315f226042667db2286f737cd05b74333992222 m
Merge branch 'master' into develop
# Conflicts:
# CHANGELOG.md -
Todd Nicholson 5c6327259c42e2b76bd11a1274e28bea65ca705c m
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 m
Updated CHANGELOG for 1.8 release.
-
Luigi Marini 13b35cf027d9cb65bde56d0d886710f54f382ef5 m
Updated CHANGELOG for 1.8 release.
-
Luigi Marini d7a2c0532e868a2b0f2dda09381ea825bbe89dc5 m
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 m
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 m
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 m
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 m
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 m
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 m
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 m
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 m
bamboo uses ash (I think) and does not understand bash ==
-
Luigi Marini c6042de715da19134fdc29b68633ebe767a4137b m
Updated version and cleaned up CHANGELOG.
-
Luigi Marini 70d16034b32e3a6e853d71a373bf77ef0266bb1f m
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 m
Merge remote-tracking branch 'origin/release/1.8' into release-174-to-release-180