Skip to content

Commit b481181

Browse files
authored
Merge branch 'develop' into add-geoserver-yml
2 parents e2051a2 + 5a79d9c commit b481181

33 files changed

+3476
-2892
lines changed

.github/workflows/swagger.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: swagger
2+
3+
# This will run when:
4+
# - when new code is pushed to master/develop to make sure the
5+
# code does compile.
6+
# - when a pull request is created and updated to make sure the
7+
# code does compile.
8+
on:
9+
push:
10+
branches:
11+
- master
12+
- develop
13+
14+
pull_request:
15+
16+
# Check to make sure swagger document is valid
17+
jobs:
18+
19+
# downloads all the dependencies and compiles the scala code
20+
lint:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: openapi-lint
26+
uses: mhiew/redoc-lint-github-action@v2
27+
with:
28+
args: 'public/swagger.yml --skip-rule operation-operationId'

CHANGELOG.md

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,28 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7-
## Unreleased
7+
## unreleased
88

99
### Fixed
10-
- Added index for comments, will speed up index creation
10+
- Updated swagger documentation
11+
- Return 404 not found when calling file/dataset/space api endpoints with an invalid ID [#251](https://github.com/clowder-framework/clowder/issues/251)
12+
13+
## 1.18.0 - 2021-07-08
14+
15+
### Added
16+
- Added folder and folder id to API call `GET /api/datasets/:id/files`. [#34](https://github.com/clowder-framework/clowder/issues/34)
17+
- Ability to queue archive / unarchive for full datasets.
18+
- API status endpoint `GET /api/status` will now show what storage type is used and for superadmins will show more
19+
information about the backend storage.
20+
- `GET /api/files/bulkRemove` now returns status of files deleted, not found, no permission, or errors.
21+
22+
### Fixed
23+
- When uploading a file, any extractors marked disabled at the space level would be ignored. [#246](https://github.com/clowder-framework/clowder/issues/246)
24+
- RabbitMQ will not use connection if it does not exist.
25+
- Previews returns 404 if preview is not found `GET /api/previews/:id`.
26+
- Added index for comments, will speed up index creation.
27+
- If using S3 storage in docker, it was not reflected correctly in the docker-compose file.
28+
- Docker image for mongo-init now based on python:3.7-slim to reduce size.
1129

1230
## 1.17.0 - 2021-04-29
1331

@@ -24,6 +42,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2442
### Changed
2543
- Updated Sphinx dependencies due to security and changes in required packages.
2644

45+
- Updated the three.js libraries for the FBX previewer
46+
2747
## 1.16.0 - 2021-03-31
2848

2949
### Fixed
@@ -91,6 +111,7 @@ script to fix this.
91111
## 1.14.0 - 2021-01-07
92112

93113
### Added
114+
- Added a previewer for FBX files.
94115
- Added a new `/api/reports/metrics/extractors` report for summarizing extractor usage by user. Database administrators
95116
can use `scripts/updates/UpdateUserId.js` to assign user IDs to older extraction event records based on resource ownership
96117
in order to improve the accuracy of the report for older data.

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# How to contribute
22

33
We would love to get contributions from you! To keep the process manageable we please ask you to follow the workflow
4-
below. By participating in this project, you agree to abide by the [code of conduct](https://clowderframework.org/docs/Clowder-CoC.pdf).
5-
Before your code can be accepted, you will have to sign a [CLA](https://clowderframework.org/docs/Clowder-CLA.pdf)
4+
below. By participating in this project, you agree to abide by the [code of conduct](https://clowderframework.org/pdf/Clowder-CoC.pdf).
5+
Before your code can be accepted, you will have to sign a [CLA](https://clowderframework.org/pdf/Clowder-CLA.pdf)
66
and mail it to [email protected].
77

88
Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `master` and `develop` branches are pushed to
@@ -81,4 +81,4 @@ Developer documentation is available in [Confluence][confluence]. User documenta
8181
[bitbucket]: https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS
8282
[bamboo]: https://opensource.ncsa.illinois.edu/bamboo/browse/CATS
8383
[userdocs]: https://clowderframework.org/docs/
84-
[confluence]: https://opensource.ncsa.illinois.edu/confluence/display/CATS/Home
84+
[confluence]: https://opensource.ncsa.illinois.edu/confluence/display/CATS/Home

0 commit comments

Comments
 (0)