mirror of
https://github.com/owncast/owncast.git
synced 2024-11-21 12:18:02 +03:00
Merge branch 'develop' into Statusbar-Duration-FallbackValues
This commit is contained in:
commit
345423715f
34 changed files with 39 additions and 34 deletions
|
@ -33,6 +33,7 @@ jobs:
|
|||
if: github.event_name == 'pull_request'
|
||||
with:
|
||||
repository: ${{ github.event.pull_request.head.repo.full_name }}
|
||||
ref: ${{github.event.pull_request.head.ref}}
|
||||
|
||||
- name: Setup Nodejs
|
||||
uses: actions/setup-node@v4
|
||||
|
|
3
go.mod
3
go.mod
|
@ -32,7 +32,7 @@ require (
|
|||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
||||
golang.org/x/crypto v0.26.0
|
||||
golang.org/x/net v0.28.0
|
||||
golang.org/x/sys v0.23.0 // indirect
|
||||
golang.org/x/sys v0.24.0 // indirect
|
||||
)
|
||||
|
||||
require github.com/prometheus/client_golang v1.20.0
|
||||
|
@ -81,6 +81,7 @@ require (
|
|||
github.com/mssola/user_agent v0.6.0
|
||||
github.com/oapi-codegen/runtime v1.1.1
|
||||
github.com/shirou/gopsutil/v3 v3.24.5
|
||||
github.com/shirou/gopsutil/v4 v4.24.8
|
||||
github.com/stretchr/testify v1.9.0
|
||||
github.com/yuin/goldmark-emoji v1.0.3
|
||||
gopkg.in/evanphx/json-patch.v5 v5.9.0
|
||||
|
|
3
go.sum
3
go.sum
|
@ -127,6 +127,7 @@ github.com/schollz/sqlite3dump v1.3.1 h1:QXizJ7XEJ7hggjqjZ3YRtF3+javm8zKtzNByYtE
|
|||
github.com/schollz/sqlite3dump v1.3.1/go.mod h1:mzSTjZpJH4zAb1FN3iNlhWPbbdyeBpOaTW0hukyMHyI=
|
||||
github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
|
||||
github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
|
||||
github.com/shirou/gopsutil/v4 v4.24.8/go.mod h1:wE0OrJtj4dG+hYkxqDH3QiBICdKSf04/npcvLLc/oRg=
|
||||
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
||||
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
||||
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
|
||||
|
@ -208,6 +209,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
|
||||
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
|
||||
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
|
|
2
static/web/404.html
vendored
2
static/web/404.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/404/index.html
vendored
2
static/web/404/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/access-tokens/index.html
vendored
2
static/web/admin/access-tokens/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/actions/index.html
vendored
2
static/web/admin/actions/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/chat/emojis/index.html
vendored
2
static/web/admin/chat/emojis/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/chat/messages/index.html
vendored
2
static/web/admin/chat/messages/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/chat/users/index.html
vendored
2
static/web/admin/chat/users/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/config-chat/index.html
vendored
2
static/web/admin/config-chat/index.html
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
static/web/admin/config-notify/index.html
vendored
2
static/web/admin/config-notify/index.html
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
static/web/admin/config-video/index.html
vendored
2
static/web/admin/config-video/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/config/general/index.html
vendored
2
static/web/admin/config/general/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/config/server/index.html
vendored
2
static/web/admin/config/server/index.html
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
static/web/admin/hardware-info/index.html
vendored
2
static/web/admin/hardware-info/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/help/index.html
vendored
2
static/web/admin/help/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/index.html
vendored
2
static/web/admin/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/logs/index.html
vendored
2
static/web/admin/logs/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/stream-health/index.html
vendored
2
static/web/admin/stream-health/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/upgrade/index.html
vendored
2
static/web/admin/upgrade/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/viewer-info/index.html
vendored
2
static/web/admin/viewer-info/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/admin/webhooks/index.html
vendored
2
static/web/admin/webhooks/index.html
vendored
File diff suppressed because one or more lines are too long
4
static/web/embed/chat/readonly/index.html
vendored
4
static/web/embed/chat/readonly/index.html
vendored
File diff suppressed because one or more lines are too long
4
static/web/embed/chat/readwrite/index.html
vendored
4
static/web/embed/chat/readwrite/index.html
vendored
File diff suppressed because one or more lines are too long
4
static/web/embed/video/index.html
vendored
4
static/web/embed/video/index.html
vendored
File diff suppressed because one or more lines are too long
4
static/web/index.html
vendored
4
static/web/index.html
vendored
File diff suppressed because one or more lines are too long
2
static/web/sw.js
vendored
2
static/web/sw.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue