Commit graph

9041 commits

Author SHA1 Message Date
dependabot[bot]
e3dc51649c Bump @types/node from 15.6.1 to 15.12.1 (#206)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.6.1 to 15.12.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 19:15:02 -07:00
dependabot[bot]
b1dfce4acb Bump antd from 4.16.0 to 4.16.1 (#203)
Bumps [antd](https://github.com/ant-design/ant-design) from 4.16.0 to 4.16.1.
- [Release notes](https://github.com/ant-design/ant-design/releases)
- [Changelog](https://github.com/ant-design/ant-design/blob/master/CHANGELOG.en-US.md)
- [Commits](https://github.com/ant-design/ant-design/compare/4.16.0...4.16.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 19:11:50 -07:00
dependabot[bot]
c0601fd967 Bump @typescript-eslint/parser from 4.25.0 to 4.26.0 (#202)
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.25.0 to 4.26.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.26.0/packages/parser)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 19:11:23 -07:00
dependabot[bot]
e5ee5806bf Bump @types/react from 17.0.8 to 17.0.9 (#204)
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 17.0.8 to 17.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 19:11:05 -07:00
dependabot[bot]
8f458549b6
Bump github.com/shirou/gopsutil (#1074)
Bumps [github.com/shirou/gopsutil](https://github.com/shirou/gopsutil) from 3.21.4+incompatible to 3.21.5+incompatible.
- [Release notes](https://github.com/shirou/gopsutil/releases)
- [Commits](https://github.com/shirou/gopsutil/compare/v3.21.4...v3.21.5)

---
updated-dependencies:
- dependency-name: github.com/shirou/gopsutil
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 19:10:40 -07:00
dependabot[bot]
608b7c23ac
Bump github.com/aws/aws-sdk-go from 1.38.50 to 1.38.54 (#1078)
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.38.50 to 1.38.54.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.38.50...v1.38.54)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 19:10:22 -07:00
dependabot[bot]
09909b9f00 Bump date-fns from 2.21.3 to 2.22.1 (#200)
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.21.3 to 2.22.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.21.3...v2.22.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:36:55 -07:00
dependabot[bot]
d7d3b667ec Bump @typescript-eslint/eslint-plugin from 4.25.0 to 4.26.0 (#201)
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.25.0 to 4.26.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.26.0/packages/eslint-plugin)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:35:46 -07:00
dependabot[bot]
bf6fb4079c Bump eslint-plugin-react from 7.23.2 to 7.24.0 (#199)
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.23.2 to 7.24.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.23.2...v7.24.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:35:32 -07:00
dependabot[bot]
0a4ae04044 Bump typescript from 4.2.4 to 4.3.2 (#195)
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.4 to 4.3.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.2.4...v4.3.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:35:01 -07:00
dependabot[bot]
5ce273bc4a Bump chart.js from 3.3.0 to 3.3.2 (#197)
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.3.0 to 3.3.2.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v3.3.0...v3.3.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:34:27 -07:00
dependabot[bot]
ade7351a5b Bump eslint-plugin-import from 2.23.3 to 2.23.4 (#198)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.23.3 to 2.23.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.23.3...v2.23.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:33:55 -07:00
dependabot[bot]
c211ffc2d4
Bump cssnano from 5.0.4 to 5.0.5 in /build/javascript (#1068)
Bumps [cssnano](https://github.com/cssnano/cssnano) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/cssnano/cssnano/releases)
- [Commits](https://github.com/cssnano/cssnano/compare/cssnano@5.0.4...cssnano@5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 10:33:32 -07:00
dependabot[bot]
db71470789 Bump @types/react from 17.0.6 to 17.0.8 (#194)
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 17.0.6 to 17.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 15:22:39 -07:00
dependabot[bot]
fa1d1ff8cd
Bump ws from 7.4.0 to 7.4.6 in /test/automated (#1065)
Bumps [ws](https://github.com/websockets/ws) from 7.4.0 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.0...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 15:22:09 -07:00
Ginger Wong
e89e65e1f5 Resolve issue https://github.com/owncast/owncast/issues/1044
- use built-in videojs font icon instead
- remove button clickhandler override to make button work on mobile
2021-05-29 14:20:37 -07:00
Ginger Wong
c08744c3c4 - A fix for https://github.com/owncast/owncast/issues/1007. Hide app container when configdata is loading
- Also, disable global CSS transition animations for now. If we want to add transitions onto anything, we can target specific elements and add styles individually intead.
2021-05-29 13:08:10 -07:00
dependabot[bot]
c48f0dd9b0
Bump github.com/aws/aws-sdk-go from 1.38.49 to 1.38.50 (#1063)
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.38.49 to 1.38.50.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.38.49...v1.38.50)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-28 12:26:38 -07:00
Thilo Billerbeck
6c7acf9a95
added emoji focus check to prevent triggering shortcuts (#1056) 2021-05-27 21:39:20 -07:00
Gabe Kangas
5ef1596d65 Remove extra references to config file 2021-05-27 19:59:33 -07:00
Thilo Billerbeck
51b3fc1f76 rework stream info box in offline notice to conform more with the overall design (#196)
* rework stream info field to conform with the offline page layout

* moved offline notice css to separate file

* used ant design bold text option
2021-05-27 15:58:31 -07:00
dependabot[bot]
3fd5f6c2c5
Bump github.com/aws/aws-sdk-go from 1.38.46 to 1.38.49 (#1057)
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.38.46 to 1.38.49.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.38.46...v1.38.49)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 15:44:42 -07:00
dependabot[bot]
bbb0e2d5a1 Bump antd from 4.15.6 to 4.16.0 (#192)
Bumps [antd](https://github.com/ant-design/ant-design) from 4.15.6 to 4.16.0.
- [Release notes](https://github.com/ant-design/ant-design/releases)
- [Changelog](https://github.com/ant-design/ant-design/blob/master/CHANGELOG.en-US.md)
- [Commits](https://github.com/ant-design/ant-design/compare/4.15.6...4.16.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 22:50:42 -07:00
dependabot[bot]
8c4693703e Bump @types/node from 15.6.0 to 15.6.1 (#191)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.6.0 to 15.6.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 22:44:47 -07:00
Gabe Kangas
aa7f7f58dd Show RTMP port on home page. Closes https://github.com/owncast/owncast/issues/1049 2021-05-24 22:23:44 -07:00
Gabe Kangas
94136d4361 Demote log message 2021-05-24 21:43:13 -07:00
dependabot[bot]
38d3f67a57
Bump github.com/aws/aws-sdk-go from 1.38.44 to 1.38.46 (#1052)
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.38.44 to 1.38.46.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.38.44...v1.38.46)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:39:31 -07:00
Gabe Kangas
0b40e4db7b Update admin bundle 2021-05-24 16:37:09 -07:00
dependabot[bot]
116be1c958 Bump chart.js from 3.2.1 to 3.3.0 (#190)
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:34:30 -07:00
dependabot[bot]
c0d203c889 Bump next from 10.2.2 to 10.2.3 (#189)
Bumps [next](https://github.com/vercel/next.js) from 10.2.2 to 10.2.3.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v10.2.2...v10.2.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:32:12 -07:00
dependabot[bot]
e7e3ca4067 Bump @typescript-eslint/parser from 4.24.0 to 4.25.0 (#188)
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.24.0 to 4.25.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.25.0/packages/parser)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:28:05 -07:00
dependabot[bot]
d0b9820fb0 Bump rc-util from 5.13.0 to 5.13.1 (#187)
Bumps [rc-util](https://github.com/react-component/util) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/react-component/util/releases)
- [Changelog](https://github.com/react-component/util/blob/master/HISTORY.md)
- [Commits](https://github.com/react-component/util/compare/v5.13.0...v5.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:25:11 -07:00
dependabot[bot]
c1802cd4c6 Bump @types/node from 15.3.1 to 15.6.0 (#186)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.3.1 to 15.6.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:25:00 -07:00
dependabot[bot]
d0e942a8cb Bump eslint-plugin-import from 2.23.2 to 2.23.3 (#182)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.23.2 to 2.23.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.23.2...v2.23.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:21:30 -07:00
dependabot[bot]
a3d2213a41 Bump @typescript-eslint/eslint-plugin from 4.24.0 to 4.25.0 (#185)
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.24.0 to 4.25.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.25.0/packages/eslint-plugin)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:20:56 -07:00
dependabot[bot]
dcc0eb3c73 Bump sass from 1.33.0 to 1.34.0 (#183)
Bumps [sass](https://github.com/sass/dart-sass) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.33.0...1.34.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:20:40 -07:00
Gabe Kangas
8437a6fb78 Remove checkout ref 2021-05-24 16:19:33 -07:00
dependabot[bot]
27cb170c34 Bump eslint from 7.26.0 to 7.27.0 (#184)
Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.26.0...v7.27.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:17:51 -07:00
dependabot[bot]
ddda4b7fa0
Bump browserslist from 4.14.5 to 4.16.6 in /build/javascript (#1051)
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.5 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.5...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 16:15:34 -07:00
leuc
5ab901bb36
Fix #981 Use -webserverip to set http listen address (#1032)
* Fix #981 Use -webserverip to set http listen address

* use 0.0.0.0 as default http listen address

* add Admin REST API for setting http listen address

* full input validation of port and IP
2021-05-24 16:13:49 -07:00
dependabot[bot]
dd8bf54f66
Bump cssnano from 5.0.3 to 5.0.4 in /build/javascript (#1050)
Bumps [cssnano](https://github.com/cssnano/cssnano) from 5.0.3 to 5.0.4.
- [Release notes](https://github.com/cssnano/cssnano/releases)
- [Commits](https://github.com/cssnano/cssnano/compare/cssnano@5.0.3...cssnano@5.0.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-24 15:51:01 -07:00
Gabe Kangas
1a0beb1d0e Fix tests 2021-05-23 14:27:35 -07:00
Gabe Kangas
5cdb6c3417 Create+use logs dir within data dir for logging 2021-05-23 14:24:20 -07:00
Meisam
8b57ddcfb1
Remove config file migrator (#1045)
* rm migrator consts

* Delete migrator.go

* rm RunMigrations()
2021-05-23 13:36:34 -07:00
Fabian Fischer
d3696cd0aa
fix: avoid duplicate cache-control header (#1048) 2021-05-23 13:35:05 -07:00
Gabe Kangas
fd864acab1 Update admin bundle 2021-05-23 00:02:05 -07:00
gingervitis
24f5891fcc Merge branch 'develop' of github.com:owncast/owncast-admin into develop 2021-05-22 23:58:42 -07:00
gingervitis
53a4ec639d Merge branch 'gw/2021-05-22/admin-width' into develop 2021-05-22 23:58:27 -07:00
gingervitis
4d5b12cb15 use full width of screen instead of limiting admin content to max-width 2021-05-22 23:57:49 -07:00
gingervitis
e5db35590c Merge branch 'develop' into gw/2021-05-22/admin-width 2021-05-22 23:36:13 -07:00