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 |
|
Rob Thomas
|
eaf73bd659
|
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 |
|
github-actions[bot]
|
1b4902fabf
|
New Crowdin Translations (automated) (#26913)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2023-09-18 13:46:07 +02:00 |
|
github-actions[bot]
|
654bc9974d
|
New Crowdin Translations (automated) (#26913)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2023-09-18 13:46:07 +02:00 |
|
Claire
|
31dedf4697
|
[Glitch] Fix Web UI making duplicate search queries when scrolling
Port 4c1518a6f3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-09-18 12:12:55 +02:00 |
|
Claire
|
c5f333d647
|
[Glitch] Fix Web UI making duplicate search queries when scrolling
Port c7d113e2d2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-09-18 12:12:55 +02:00 |
|
Claire
|
f61e29cc7e
|
[Glitch] Fix error in Web UI when server rules cannot be fetched
Port 893755f4cb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-09-18 12:11:09 +02:00 |
|
Claire
|
2803efb84e
|
[Glitch] Fix error in Web UI when server rules cannot be fetched
Port 11e4c747fc to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-09-18 12:11:09 +02:00 |
|
Claire
|
9688c5fcc4
|
Merge branch 'main' into glitch-soc/merge-upstream
|
2023-09-18 12:09:37 +02:00 |
|
Claire
|
f0850150f9
|
Merge branch 'main' into glitch-soc/merge-upstream
|
2023-09-18 12:09:37 +02:00 |
|
Claire
|
4c1518a6f3
|
Fix Web UI making duplicate search queries when scrolling (#26959)
|
2023-09-18 11:20:09 +02:00 |
|
Claire
|
c7d113e2d2
|
Fix Web UI making duplicate search queries when scrolling (#26959)
|
2023-09-18 11:20:09 +02:00 |
|
Claire
|
893755f4cb
|
Fix error in Web UI when server rules cannot be fetched (#26957)
|
2023-09-18 09:51:52 +02:00 |
|
Claire
|
11e4c747fc
|
Fix error in Web UI when server rules cannot be fetched (#26957)
|
2023-09-18 09:51:52 +02:00 |
|
Claire
|
392c07f2bf
|
Fix Setting.authorized_fetch not being properly taken into consideration (#26958)
|
2023-09-18 09:37:29 +02:00 |
|
Claire
|
685d00e64f
|
Fix Setting.authorized_fetch not being properly taken into consideration (#26958)
|
2023-09-18 09:37:29 +02:00 |
|
renovate[bot]
|
8b5c61ae3a
|
Update formatjs monorepo (#26955)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
2023-09-18 08:52:49 +02:00 |
|
renovate[bot]
|
4ffa3c2d1d
|
Update formatjs monorepo (#26955)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
2023-09-18 08:52:49 +02:00 |
|
renovate[bot]
|
04623e2f34
|
Update babel monorepo to v7.22.20 (#26946)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
2023-09-18 08:34:04 +02:00 |
|
renovate[bot]
|
f28698d4c0
|
Update babel monorepo to v7.22.20 (#26946)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
2023-09-18 08:34:04 +02:00 |
|
Kouhai
|
ae323d3a45
|
th: oops
|
2023-09-16 20:42:22 -07:00 |
|
Kouhai
|
9d32bdbcde
|
th: Merge remote-tracking branch 'glitch/main'
|
2023-09-16 20:35:31 -07:00 |
|
Claire
|
743fede5be
|
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 6273416292
|
2023-09-16 09:57:00 +02:00 |
|
Claire
|
1f7643db6d
|
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 38fe6ecd05
|
2023-09-16 09:57:00 +02:00 |
|
Claire
|
60ecca6acb
|
Revert tabs background color so they are easier to visually distinguish from contents
|
2023-09-16 09:50:00 +02:00 |
|
Claire
|
eb817b5747
|
Revert tabs background color so they are easier to visually distinguish from contents
|
2023-09-16 09:50:00 +02:00 |
|