Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
- uses: actions/checkout@v2

- name: openapi-lint
uses: mhiew/redoc-lint-github-action@v2
uses: mbowman100/swagger-validator-action@master
with:
args: 'public/swagger.yml --skip-rule operation-operationId'
files: public/swagger.yml
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.20.2 - 2022-04-30

### Fixed
- swagger lint action

### Changed
- Changed `Enabled By SuperAdmin` to read `Enabled by Server Admin` [#344](https://github.com/clowder-framework/clowder/issues/344)

## 1.20.1 - 2022-04-04

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions app/views/spaces/updateExtractors.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ <h1>Space Extractors</h1>
<th>Name</th>
<th>Description</th>
<th>Process Triggers</th>
<th class="text-center" title="Extractors marked for execution in all spaces">Enabled By SuperAdmin</th>
<th class="text-center" title="Follow selection in 'Enabled By SuperAdmin' column">Use Default</th>
<th class="text-center" title="Extractors marked for execution in all spaces">Enabled by Server Admin</th>
<th class="text-center" title="Follow selection in 'Enabled by Server Admin' column">Use Default</th>
<th class="text-center" title="Always trigger execution in this space">Enable in Space</th>
<th class="text-center" title="Never trigger execution in this space">Disable in Space</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion doc/src/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Luigi Marini'

# The full version, including alpha/beta/rc tags
release = '1.20.1'
release = '1.20.2'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import NativePackagerKeys._
object ApplicationBuild extends Build {

val appName = "clowder"
val version = "1.20.1"
val version = "1.20.2"
val jvm = "1.7"

def appVersion: String = {
Expand Down
2 changes: 1 addition & 1 deletion public/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ info:
Clowder is a customizable and scalable data management system to support any
data format and multiple research domains. It is under active development
and deployed for a variety of research projects.
version: 1.20.1
version: 1.20.2
termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
contact:
name: Clowder
Expand Down