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
ffd10e0f65
Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-09-19 17:38:05 +02:00
Claire
f19239e026
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:32:48 +02:00
Claire
883609356e
Fix incorrect PostgreSQL version check ( #26979 )
2023-09-19 17:31:58 +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
65646a3e89
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Claire
8584afea68
Bump version to v4.2.0-rc2 ( #26974 )
2023-09-19 17:04:23 +02:00
Claire
593e3e2e29
Merge pull request from GHSA-v3xf-c9qf-j667
2023-09-19 16:53:58 +02:00
Claire
f3c553b6f1
Merge pull request from GHSA-2693-xr3m-jhqr
2023-09-19 16:53:21 +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#26219 )"
This reverts commit 266bbfc884
2023-09-19 16:52:52 +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
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
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
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
97740f900c
Merge commit 'fd4f319fd20631f171b1f862b8c1f32f605b3166' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +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]
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
a8e7fb0c4d
Change video bitrate to always fit within size limit ( #26970 )
2023-09-19 12:25:58 +02:00
Claire
416e215991
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
2023-09-19 12:25:39 +02:00
Emelia Smith
c1b1cbb58a
Add additional metrics for streaming ( #26945 )
2023-09-19 12:25:30 +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]
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]
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]
e39dfc701f
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 10:41:48 +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]
654bc9974d
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-18 13:46:07 +02:00
Claire
c5f333d647
[Glitch] Fix Web UI making duplicate search queries when scrolling
...
Port c7d113e2d2
2023-09-18 12:12:55 +02:00
Claire
2803efb84e
[Glitch] Fix error in Web UI when server rules cannot be fetched
...
Port 11e4c747fc
2023-09-18 12:11:09 +02:00
Claire
f0850150f9
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-18 12:09:37 +02:00
Claire
c7d113e2d2
Fix Web UI making duplicate search queries when scrolling ( #26959 )
2023-09-18 11:20:09 +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
685d00e64f
Fix Setting.authorized_fetch not being properly taken into consideration ( #26958 )
2023-09-18 09:37:29 +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]
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
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
eb817b5747
Revert tabs background color so they are easier to visually distinguish from contents
2023-09-16 09:50:00 +02:00
Claire
c4da1fb1bd
[Glitch] Fix dismiss button overlapping with text in dismissable banners
...
Port e5e9e18c96
2023-09-15 21:48:36 +02:00
Claire
c31020044b
Merge commit '38fe6ecd05e9349717b60452eff6e5ff4809b82b' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
Claire
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
f0714c8106
[Glitch] Fix notification permissions being requested immediately after login
...
Port f5f4f40955
2023-09-15 21:33:28 +02:00
Santiago Kozak
082e969b4f
[Glitch] Fix recent search items not handling overflows correctly
...
Port 4b1c517e8e
2023-09-15 21:31:46 +02:00
Claire
3947d7a153
Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
2023-09-15 21:25:05 +02:00
Eugen Rochko
660857bf06
[Glitch] Add recent searches in web UI
...
Port 0f8203badd
2023-09-15 21:15:41 +02:00
Claire
baba47c85a
[Glitch] Fix confusing behavior of mute button and volume slider in web UI
...
Port 850eca8ab0
2023-09-15 21:12:53 +02:00
Eugen Rochko
cf03ddb5c8
[Glitch] Fix mute button and volume slider feeling disconnected in web UI
...
Port bb0966bf85
2023-09-15 21:12:13 +02:00
Eugen Rochko
d22bbeb7e5
[Glitch] Change onboarding prompt to use full width of banner in web UI
...
Port f56ca513fc
2023-09-15 21:09:28 +02:00
Claire
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
