kouhai
1288d4c9b6
th: Merge remote-tracking branch 'glitch/main' ( 5efa6ac771
)
2023-10-22 16:15:44 -07:00
Kouhai
d22e3b86f2
th: fix streaming
2023-09-20 22:23:45 -07:00
Kouhai
150feaf9b7
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:26:14 -07:00
Claire
5efa6ac771
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-09-19 17:38:05 +02:00
Claire
ffd10e0f65
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-09-19 17:38:05 +02:00
Claire
6a9e93ae19
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:32:48 +02:00
Claire
f19239e026
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:32:48 +02:00
Claire
abcc0b38fa
Fix incorrect PostgreSQL version check ( #26979 )
2023-09-19 17:31:58 +02:00
Claire
883609356e
Fix incorrect PostgreSQL version check ( #26979 )
2023-09-19 17:31:58 +02:00
Claire
57f47e50f0
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-09-19 17:14:35 +02:00
Claire
5e18bc0301
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-09-19 17:14:35 +02:00
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Claire
65646a3e89
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Claire
f4b780ba22
Bump version to v4.2.0-rc2 ( #26974 )
2023-09-19 17:04:23 +02:00
Claire
8584afea68
Bump version to v4.2.0-rc2 ( #26974 )
2023-09-19 17:04:23 +02:00
Claire
eeab3560fc
Merge pull request from GHSA-v3xf-c9qf-j667
2023-09-19 16:53:58 +02:00
Claire
593e3e2e29
Merge pull request from GHSA-v3xf-c9qf-j667
2023-09-19 16:53:58 +02:00
Claire
ff32475f5f
Merge pull request from GHSA-2693-xr3m-jhqr
2023-09-19 16:53:21 +02:00
Claire
f3c553b6f1
Merge pull request from GHSA-2693-xr3m-jhqr
2023-09-19 16:53:21 +02:00
Claire
94893cf24f
Merge pull request from GHSA-hcqf-fw2r-52g4
...
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit 8891d8945d
.
* Revert "Do not normalize URL before fetching it (#26219 )"
This reverts commit fd284311e7
.
2023-09-19 16:52:52 +02:00
Claire
1cf501ddca
Merge pull request from GHSA-hcqf-fw2r-52g4
...
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit da740ec43c
.
* Revert "Do not normalize URL before fetching it (#26219 )"
This reverts commit 266bbfc884
.
2023-09-19 16:52:52 +02:00
github-actions[bot]
73ecc4de6e
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 16:26:51 +02:00
github-actions[bot]
a68f361a5f
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 16:26:51 +02:00
Claire
0cb343eec2
Tag nightly images as latest
in glitch-soc, as it has no proper releases ( #2414 )
2023-09-19 16:16:35 +02:00
Claire
f034c8ad0f
Tag nightly images as latest
in glitch-soc, as it has no proper releases ( #2414 )
2023-09-19 16:16:35 +02:00
Claire
6f6586808e
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to a83615edc9
2023-09-19 14:02:04 +02:00
Claire
0a0bdb759e
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 4ae2479543
2023-09-19 14:02:04 +02:00
Claire
22ee4e057d
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
2023-09-19 12:59:23 +02:00
Claire
6b89ab368c
Merge commit '4ae247954387b530b532eaa89ca017a17cbe63bd' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
2023-09-19 12:59:23 +02:00
Claire
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +02:00
Claire
97740f900c
Merge commit 'fd4f319fd20631f171b1f862b8c1f32f605b3166' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +02:00
Claire
7ea5a2c82c
Merge pull request #2411 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 9688c5fcc4
2023-09-19 12:52:17 +02:00
Claire
a4890786e9
Merge pull request #2411 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f0850150f9
2023-09-19 12:52:17 +02:00
renovate[bot]
a83615edc9
Update eslint (non-major) ( #26954 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 12:51:13 +02:00
renovate[bot]
4ae2479543
Update eslint (non-major) ( #26954 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 12:51:13 +02:00
Eugen Rochko
0f3f9b611f
Change video bitrate to always fit within size limit ( #26970 )
2023-09-19 12:25:58 +02:00
Eugen Rochko
a8e7fb0c4d
Change video bitrate to always fit within size limit ( #26970 )
2023-09-19 12:25:58 +02:00
Claire
70cae19b6b
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
2023-09-19 12:25:39 +02:00
Claire
416e215991
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
2023-09-19 12:25:39 +02:00
Emelia Smith
fbfceb9c77
Add additional metrics for streaming ( #26945 )
2023-09-19 12:25:30 +02:00
Emelia Smith
c1b1cbb58a
Add additional metrics for streaming ( #26945 )
2023-09-19 12:25:30 +02:00
renovate[bot]
6eb6209d02
Update DefinitelyTyped types (non-major) ( #26953 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 12:24:26 +02:00
renovate[bot]
fd4f319fd2
Update DefinitelyTyped types (non-major) ( #26953 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 12:24:26 +02:00
renovate[bot]
c6a535a197
Update dependency node to 20.7 ( #26963 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 11:16:45 +02:00
renovate[bot]
6fc3bc6d3e
Update dependency node to 20.7 ( #26963 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 11:16:45 +02:00
renovate[bot]
6f9f901153
Update dependency postcss to v8.4.30 ( #26964 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 11:03:42 +02:00
renovate[bot]
1f388f1ee9
Update dependency postcss to v8.4.30 ( #26964 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 11:03:42 +02:00
github-actions[bot]
67eaaa4b90
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 10:41:48 +02:00
github-actions[bot]
e39dfc701f
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 10:41:48 +02:00
Rob Thomas
200312e8be
Fix crash when viewing a moderation appeal and the moderator account has been deleted ( #25900 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-09-18 17:41:32 +02:00