Code commits
clowder
-
Luigi Marini 3b84e70e5518df81a038347a9698adadc94a2600
Fixed typo in CHANGELOG.md.
-
Luigi Marini b7dbefc7bc99597c3f6b1723b0be5915ed7a72f9
Updated changelog.
-
Luigi Marini 54cfe7544a67df9aecefb374e2a74f435b5db5fc
Updated version to 1.9.0.
- CHANGELOG.md (version 54cfe7544a67df9aecefb374e2a74f435b5db5fc) (diffs)
- doc/src/sphinx/conf.py (version 54cfe7544a67df9aecefb374e2a74f435b5db5fc) (diffs)
- project/Build.scala (version 54cfe7544a67df9aecefb374e2a74f435b5db5fc) (diffs)
- public/swagger.yml (version 54cfe7544a67df9aecefb374e2a74f435b5db5fc) (diffs)
-
Luigi Marini 7c5d553e0942c3284e7f3eebd3c07e963acbe342
Pull request #1460: Swagger updates
Merge in CATS/clowder from swagger-updates to develop
* commit 'af03107172bc278cc3ee1bf9a4e912c4a71e6ece':
more updates, fixed code to return correct swagger 3.0 doc
more fixes to swagger
update swagger doc to openapi -
Luigi Marini a60eb4b2cc07add98b2661ba7e2fdbc831880d26
Pull request #1456: CATS-1057: Verify that S3 bucket exists on startup, create it if not
Merge in CATS/clowder from CATS-1057-verify-that-s3-bucket-exists-on-startup to develop
* commit 'aed0c9995b0e4032db335f21f5d62006271a5b9f':
Add back Logger warning message on bucket create
Verify bucket exists on startup, create it if not -
Sara Lambert aed0c9995b0e4032db335f21f5d62006271a5b9f
fix merge conflict
-
Rob Kooper 14d866c6e46ed4679d43726cd0b28d18a9bec823
bad merge
-
Rob Kooper a8099b245f745c7ea58a3cabc7dc3b9fa4c0fd24
Merge remote-tracking branch 'ncsa/develop' into docker-minio
-
Rob Kooper af03107172bc278cc3ee1bf9a4e912c4a71e6ece m
more updates, fixed code to return correct swagger 3.0 doc
-
Luigi Marini 65486857875793b9a5c5822015fcbdcf26282105
Updated CHANGELOG.md
-
Luigi Marini bcc778721ac5c4b38fe833f1a6832f5deb899f27
Updated CHANGELOG.md
-
Luigi Marini 6e3b5b4f59232dafd6050ecf6cd4c38989869c08
Merge branch 'develop' into feature/CATS-1000-visualize-generic-relationships-on-dataset-and-file-pages
# Conflicts:
# app/controllers/Datasets.scala
# app/views/dataset.scala.html -
Luigi Marini 8233013833ff17887ebb21d1ad7e7493875bfd96
Updated CHANGELOG.md
-
Luigi Marini 8266c0d929f79117eddc0fe149fb96cbfe3ce3df
Merge branch 'develop' into CATS-1055-remove-dataset-from-space-button-is-confusing
-
Luigi Marini 52731eaab45a78856209d421f4a09f4b296ed8d4
Merge branch 'master' into develop
# Conflicts:
# CHANGELOG.md -
Luigi Marini 6107946b4c5616b051aa2679009e83a747369030 m
Merge branch 'develop' into CATS-1055-remove-dataset-from-space-button-is-confusing
-
Luigi Marini 5968d6601b55fabfc6b3159120c186fd0f87a4d7 m
Pull request #1434: Create tester.sh script
Merge in CATS/clowder from add-tester-script to develop
* commit '1f9e6c038b740071444c8873111bb3977bcf05a6':
update
updates
update Dockerfile
updates to use Ubuntu
dockerfile
updates
remove old geo metadata cotaining invalidate geo url
script to submit geoserver extractions
add slack message notification
Create tester.sh -
Luigi Marini aedcdf2319073096de21a817edb8b7e6e2c38a6f m
Merge branch 'develop' into filtering-on-dataset-files
# Conflicts:
# CHANGELOG.md -
Luigi Marini 6028f867ae5a4fe825170f93095b922f24361d3c m
Pull request #1457: CATS-1058: allow user to easily flip through the files in a dataset
Merge in CATS/clowder from CATS-1058-allow-user-to-easily-flip-through-the-files-in-a-dataset to develop
* commit 'f5701c0144d1ad51f8ed05ee24f67cccac2a1b1d':
Add some documenting comments about Pager, add tooltips
Reverse sort order, disable (instead of hiding) inactive Pager buttons
Move Next/Prev buttons to the top, add CHANGELOG entry
Added Next/Previous buttons to file viewer when viewing from a dataset -
Sara Lambert f5701c0144d1ad51f8ed05ee24f67cccac2a1b1d m
Add some documenting comments about Pager, add tooltips
-
Rob Kooper 2a7948fe3368400fa9d1c3a665f8fa5de295aba5 m
more fixes to swagger
-
Rob Kooper 0b7347c09bf2af7846868c7f28ba319705b46779 m
update swagger doc to openapi
-
Rob Kooper 103e0e6dc240dd12e2613b8bf44d3e53cd7a897f m
update CHANGELOG
-
Rob Kooper d399c4060b2ff9c1d0d1a949f0210a0b32709969 m
copy files with owner
-
Rob Kooper 27bfe4b779a15dbc67465e920edbeadfd1648fba m
add S3 storage to config
- docker-compose.override.example.yml (version 27bfe4b779a15dbc67465e920edbeadfd1648fba) (diffs)
- docker-compose.yml (version 27bfe4b779a15dbc67465e920edbeadfd1648fba) (diffs)
- docker/custom.conf (version 27bfe4b779a15dbc67465e920edbeadfd1648fba) (diffs)
- env.example (version 27bfe4b779a15dbc67465e920edbeadfd1648fba) (diffs)
-
Sara Lambert 81d8495081d6bc41b539926e2e490c8e40830544 m
Reverse sort order, disable (instead of hiding) inactive Pager buttons
-
Luigi Marini a468fec5a9fb3fe0a0bfb3b9176d454a16944c84 m
Fixed CHANGELOG.md
-
Max Burnette <mburnet2@illinois.com> 073a3d77bbdc9130bbb054178b0639c4b1c23c44 m
Merge branch 'develop' into filtering-on-dataset-files
-
Max Burnette <mburnet2@illinois.com> a30cb0bce6b18696dcd5986182045723ba46df9f m
Clean up search box behavior and update Changelog
- CHANGELOG.md (version a30cb0bce6b18696dcd5986182045723ba46df9f) (diffs)
- app/controllers/Datasets.scala (version a30cb0bce6b18696dcd5986182045723ba46df9f) (diffs)
- app/views/dataset.scala.html (version a30cb0bce6b18696dcd5986182045723ba46df9f) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version a30cb0bce6b18696dcd5986182045723ba46df9f) (diffs)
-
Sara Lambert 6e0046d875992daca934ef5ae59d3f434aff6af9 m
Move Next/Prev buttons to the top, add CHANGELOG entry
-
Max Burnette <mburnet2@illinois.com> a4cdb48aedd4e0b354c78b1a3b5df00a710a4551 m
Fix spacing on toolbar, add comments
-
Sara Lambert 59a8576d2bab1c1576bc7c5cc5bc23eddccb7970 m
Added Next/Previous buttons to file viewer when viewing from a dataset
-
Bing Zhang 1f9e6c038b740071444c8873111bb3977bcf05a6 m
update
-
Sara Lambert d2424387e00095edfa28fb984d9d95e528c65d7b m
Fix merge conflict
-
Sara Lambert 2143fb9bfa23e7bf5c52ceace428dd6b689831dd m
Add back Logger warning message on bucket create
-
Max Burnette <mburnet2@illinois.com> b0c208cc84a3d79c8723a7050896c0c98a0949f0 m
add filter box to dataset file listilng
- app/controllers/Datasets.scala (version b0c208cc84a3d79c8723a7050896c0c98a0949f0) (diffs)
- app/views/dataset.scala.html (version b0c208cc84a3d79c8723a7050896c0c98a0949f0) (diffs)
- app/views/datasets/filesAndFolders.scala.html (version b0c208cc84a3d79c8723a7050896c0c98a0949f0) (diffs)
- conf/routes (version b0c208cc84a3d79c8723a7050896c0c98a0949f0) (diffs)
-
Sara Lambert c4a62d7221b96042ecf4bbfe17328eadb5f9e17f m
Verify bucket exists on startup, create it if not
-
Bing Zhang 29221cfa5a4091f8f08070bed4ee7c1a4af78878 m
updates
-
Luigi Marini ba6dd8dea5b0d732b05a5892fbfa6816151e9948 m
Merge remote-tracking branch 'origin/feature/CATS-1056-list-spaces-datasets-collections-created-by-each-user-on-their-user-profile' into feature/CATS-1056-list-spaces-datasets-collections-created-by-each-user-on-their-user-profile
-
Bing Zhang 449cea3fb22e2f29dabb311bf585878e25460b40 m
update Dockerfile
-
Sara Lambert cb017f97869a610ef6b93674f99db7ee5c294610 m
Fixes merge conflict in CHANGELOG.md
-
Luigi Marini 48525cce33be884135a516fab3f36fffaa555654 m
Pull request #1453: Index more owner data
Merge in CATS/clowder from index-more-owner-data to develop
* commit 'bc8c40aac0ab98cb97885d050f3e2d40463308d8':
CHANGELOG updated.
CHANGELOG updated.
CHANGELOG updated.
fix syntax help label
support email field search
add name and email to index -
Luigi Marini bc8c40aac0ab98cb97885d050f3e2d40463308d8 m
CHANGELOG updated.
-
Luigi Marini fb996076904cb15c3ea5a14be8b9a451c3f076b7 m
CHANGELOG updated.
-
Luigi Marini b370ffc9d4623c5fe27356de5fc1b1dde56f65d0 m
CHANGELOG updated.
-
Luigi Marini 7c5937c32aae49f43e8781634ae46da0422d9637 m
Added masonry javascript to profile page to layout tiles.
- app/views/home.scala.html (version 7c5937c32aae49f43e8781634ae46da0422d9637) (diffs)
- app/views/profile.scala.html (version 7c5937c32aae49f43e8781634ae46da0422d9637) (diffs)
- app/views/util/masonryTabbed.scala.html (version 7c5937c32aae49f43e8781634ae46da0422d9637) (diffs)
- app/views/util/multimasonry.scala.html (version 7c5937c32aae49f43e8781634ae46da0422d9637) (diffs)
-
Luigi Marini dee776c50b75c9cb656dec7ec078c8fd509560d9 m
Merge branch 'master' into develop
# Conflicts:
# CHANGELOG.md -
Sara Lambert 3fa8e41bbd7c9421aa6fb49f00af26bc7fda17a8 m
Fixed i18n Messages, added new a i18n Message for when ownProfile=false
- app/views/collections/miniList.scala.html (version 3fa8e41bbd7c9421aa6fb49f00af26bc7fda17a8) (diffs)
- app/views/datasets/miniList.scala.html (version 3fa8e41bbd7c9421aa6fb49f00af26bc7fda17a8) (diffs)
- app/views/profile.scala.html (version 3fa8e41bbd7c9421aa6fb49f00af26bc7fda17a8) (diffs)
- app/views/spaces/miniList.scala.html (version 3fa8e41bbd7c9421aa6fb49f00af26bc7fda17a8) (diffs)
- conf/messages (version 3fa8e41bbd7c9421aa6fb49f00af26bc7fda17a8) (diffs)
-
Max Burnette <mburnet2@illinois.com> 52dd1d790ba45c9f2781a467b35a134fe319d1e4 m
fix syntax help label
-
Max Burnette <mburnet2@illinois.com> 18a50a64b34de4e97ab350c0783ccd87829456a9 m
support email field search
-
Sara Lambert d2387bdaf0151d35051acdf065a6a3c920053f9e m
Respect superAdmin mode, fixed mismatched parameters
-
Bing Zhang 6a8436670a83841657b1ffe6472dd84a3a137aec m
updates to use Ubuntu
-
Bing Zhang 55658375c006861da1bf4a42b9929fbbb8f929ec m
dockerfile
-
Max Burnette <mburnet2@illinois.com> 7788e4c28957accb20709e26f1dacdfdace4c7b6 m
add name and email to index
-
Bing Zhang 8a8f89b51cfb1c682108050ca4337d7c9a1ac1ff m
updates
-
Bing Zhang 7d6f64e30f204296cd4ee8565b174794d8ea7133 m
Merge branch 'add-tester-script' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into add-tester-script
-
Bing Zhang 37e34f4632d58f78bb966528dabc5f2da7df0848 m
merge conflicts resolved
-
Bing Zhang 8568eb2a62a0d287ba22eaad6ebe2b894bcff6c2 m
remove old geo metadata cotaining invalidate geo url
-
Sara Lambert 18c5e4c146fde30fe095bf91a63b39246b7139c0 m
Embed Spaces/Datasets/Collections viewer into user profile page
- CHANGELOG.md (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/controllers/Profile.scala (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/views/collections/miniList.scala.html (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/views/datasets/miniList.scala.html (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/views/home.scala.html (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/views/profile.scala.html (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/views/spaces/miniList.scala.html (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
- app/views/spaces/tile.scala.html (version 18c5e4c146fde30fe095bf91a63b39246b7139c0) (diffs)
-
Luigi Marini 42f95eba28e2d4191c72c554f736470232fd468b m
Moved Remove button from list of subcollections in collection on the listing page to the collection page to be consistent with datasets.
-
Luigi Marini 2244437c6212b8a1eb76183f3425725c4431b9a7 m
Removed button on listing of datasets to remove a dataset from a space or a collection. It was creating confusing for users who thought this was to delete the dataset. This functionality is still available on the dataset page.
-
Luigi Marini b41a2a1962db98c1340006c5d45f800743eb2568 m
Fixed API call to correct endpoint when deleting tags on file page.
-
Luigi Marini becb27ea2d3c3c15d4d3a620c927b71c9fb5a44d m
Merge branch 'develop' into bugfix/CATS-1053-tags-added-to-sections-do-not-appear-until-refresh
# Conflicts:
# CHANGELOG.md -
Luigi Marini 8afaa80b31a94bf58f3d134a983f2fbc77d03eef m
Fixed API call to correct endpoint when deleting tags on file page.
-
Todd Nicholson 1863bef4df87a5a4835d113475ed328d8e69670b m
needed Tag import in SectionService
-
Todd Nicholson d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961 m
initial commit
when tags are added to sections, the new tag cannot be added without the new tag name and id. to fix this, tagService addTagsHelper now also returns the tags that were added in addition to the (not_found, error_string.) So now, adding tags to sections returns a list of the new tags in the response, so that the new tag is added to the right div in sectionRubberband.js.- app/api/Files.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/api/Sections.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/DatasetService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/FileService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/SectionService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/TagService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/mongodb/MongoDBSectionService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/services/mongodb/MongoDBTagService.scala (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- app/views/file.scala.html (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
- public/javascripts/previewers/sectionRubberband.js (version d123d071dc6b1a88f40a93e4f2d8d42e6b8ae961) (diffs)
-
Bing Zhang 5e79f8392d1d18c28c7cc63e57bd28e06348e6b7 m
script to submit geoserver extractions
-
Todd Nicholson 03762b5306aa229c1ea037210accd5f44b45d1f7 m
changing button to red
-
Todd Nicholson c7a6c28b44748b8c745c409e66b72996e4e11b10 m
printing out info if extractor not found that was to be deleted
-
Todd Nicholson 983b47d4f932471569975c356accb66ea30791b3 m
fixing the button delete not back
-
Todd Nicholson 624e6e126aaeb960a3ac4bc069f5fb659ebc2a5b m
wrong branch for this change, undoing
-
Todd Nicholson 56f6e452cb46100b37801b433c7124fd1acd097a m
reverted change fixed in other PR
-
Todd Nicholson 9a17cf430a51af9ea19f9f5918d04455b60fcf6d m
button changed
-
Todd Nicholson 67a88391b8c8848929a9909b7e8344528b5019ff m
Merge branch 'develop' into feature/CATS-1044-allow-delete-extractor
# Conflicts:
# CHANGELOG.md -
Todd Nicholson 8bfb22a4608e221a2714f49dbcd610987adbfcf4 m
changelog
-
Todd Nicholson f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc m
extractor is deleted and redirect works
- app/api/Extractions.scala (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
- app/services/mongodb/MongoDBExtractorService.scala (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
- app/views/extractorDetails.scala.html (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
- conf/routes (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
- public/javascripts/extractors/extractors.js (version f2010eb4b2b13439dd5dc70cbe6719a294dcf9bc) (diffs)
-
Todd Nicholson ace807b477829aa5747b1129a7219700ce729efe m
adding to js routes delete does not currently work
- app/api/Extractions.scala (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
- app/controllers/Application.scala (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
- app/services/mongodb/MongoDBExtractorService.scala (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
- conf/routes (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
- public/javascripts/deleteUtils.js (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
- public/javascripts/extractors/extractors.js (version ace807b477829aa5747b1129a7219700ce729efe) (diffs)
-
Todd Nicholson 0e59edf7c8b5e20d123811485deacd1fb067d4bc m
adding ability to delete extractor
- app/api/Extractions.scala (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
- app/services/ExtractorService.scala (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
- app/services/mongodb/MongoDBExtractorService.scala (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
- conf/routes (version 0e59edf7c8b5e20d123811485deacd1fb067d4bc) (diffs)
-
Todd Nicholson 1fe70e41cfde5853cd012f98efdb28402b33dc99 m
button present, modal pops up, does not actually delete and redirect yet
-
Max Burnette <mburnet2@illinois.com> 05b7f53e44ad4245c65123134947b70d07a36641 m
add slack message notification
-
Max Burnette <mburnet2@illinois.com> 96ad12bdde9c6d0aee76664831dda544f37963a5 m
Create tester.sh
-
Luigi Marini cb6558433ddb0493666ba81b72577d6e8de5a20a m
Show related datasets on dataset page as a new tab.
- app/controllers/Datasets.scala (version cb6558433ddb0493666ba81b72577d6e8de5a20a) (diffs)
- app/models/Relation.scala (version cb6558433ddb0493666ba81b72577d6e8de5a20a) (diffs)
- app/views/dataset.scala.html (version cb6558433ddb0493666ba81b72577d6e8de5a20a) (diffs)
- app/views/relations/list.scala.html (version cb6558433ddb0493666ba81b72577d6e8de5a20a) (diffs)