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
Claire
d3f14dd7d4
[Glitch] Fix dismiss button overlapping with text in dismissable banners
...
Port 2a4fcc51fd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:48:36 +02:00
Claire
c4da1fb1bd
[Glitch] Fix dismiss button overlapping with text in dismissable banners
...
Port e5e9e18c96
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:48:36 +02:00
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' 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
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
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
cf8b242c4c
[Glitch] Fix notification permissions being requested immediately after login
...
Port 520b570474
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:33:28 +02:00
Claire
f0714c8106
[Glitch] Fix notification permissions being requested immediately after login
...
Port f5f4f40955
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:33:28 +02:00
Santiago Kozak
0b5903af7c
[Glitch] Fix recent search items not handling overflows correctly
...
Port d2cfcdd09e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:31:46 +02:00
Santiago Kozak
082e969b4f
[Glitch] Fix recent search items not handling overflows correctly
...
Port 4b1c517e8e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:31:46 +02:00
Claire
e193c848fe
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' 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
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
7384015505
[Glitch] Add recent searches in web UI
...
Port 9b2bc3d1de
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:15:41 +02:00
Eugen Rochko
660857bf06
[Glitch] Add recent searches in web UI
...
Port 0f8203badd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:15:41 +02:00
Claire
263d601c25
[Glitch] Fix confusing behavior of mute button and volume slider in web UI
...
Port 91040da871
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:12:53 +02:00
Claire
baba47c85a
[Glitch] Fix confusing behavior of mute button and volume slider in web UI
...
Port 850eca8ab0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:12:53 +02:00
Eugen Rochko
58514651c3
[Glitch] Fix mute button and volume slider feeling disconnected in web UI
...
Port f3a2e15f8e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:12:13 +02:00
Eugen Rochko
cf03ddb5c8
[Glitch] Fix mute button and volume slider feeling disconnected in web UI
...
Port bb0966bf85
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:12:13 +02:00
Eugen Rochko
15c865808a
[Glitch] Change onboarding prompt to use full width of banner in web UI
...
Port 1f141f656d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:09:28 +02:00
Eugen Rochko
d22bbeb7e5
[Glitch] Change onboarding prompt to use full width of banner in web UI
...
Port f56ca513fc
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:09:28 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
9f3df3edee
[Glitch] Add some information about Full-text search being disabled in search popout
...
Port 9c1ef8302a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:01:40 +02:00
Claire
3f396a1b06
[Glitch] Add some information about Full-text search being disabled in search popout
...
Port 1e8b335d70
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:01:40 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
4127a9d9fe
Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Eugen Rochko
526f457ebc
[Glitch] Add infinite scrolling for search results in web UI
...
Port 5d20733d8d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 20:54:20 +02:00
Eugen Rochko
054ae66061
[Glitch] Add infinite scrolling for search results in web UI
...
Port 01e3a1f941
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 20:54:20 +02:00
Eugen Rochko
f7a4d77d90
[Glitch] Add in:
to search popout in web UI
...
Port d8bdba2f9f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 20:33:51 +02:00
Eugen Rochko
fda4246c3a
[Glitch] Add in:
to search popout in web UI
...
Port 3433972ed3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 20:33:51 +02:00
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
Claire
5cc06f5edc
Merge commit '37e5129118019dae515a876c40b25b14ac976be2' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
Claire
e5269c6a65
[Glitch] Improve interaction modal error handling
...
Port 548c032dbb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 20:11:18 +02:00
Claire
e55eb73623
[Glitch] Improve interaction modal error handling
...
Port a8a25dcbdb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 20:11:18 +02:00
Claire
e14372c2d1
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream
2023-09-15 20:08:09 +02:00
Claire
9bb5ff5a62
Merge commit 'a8a25dcbdb63efb3191dbb3720c385209ffe4f34' into glitch-soc/merge-upstream
2023-09-15 20:08:09 +02:00
Claire
6273416292
Fix post edits not being forwarded as expected ( #26936 )
2023-09-15 19:54:32 +02:00
Claire
38fe6ecd05
Fix post edits not being forwarded as expected ( #26936 )
2023-09-15 19:54:32 +02:00
Claire
2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners ( #26935 )
2023-09-15 19:53:28 +02:00
Claire
e5e9e18c96
Fix dismiss button overlapping with text in dismissable banners ( #26935 )
2023-09-15 19:53:28 +02:00
Claire
e4f5114aaf
Fix obsolete cache key in status cache invalidation logic ( #26934 )
2023-09-15 19:52:28 +02:00
Claire
4c9f14229f
Fix obsolete cache key in status cache invalidation logic ( #26934 )
2023-09-15 19:52:28 +02:00
Renaud Chaput
5d93e98da4
Fix container build when cache is disabled ( #26932 )
2023-09-15 10:44:01 +02:00
Renaud Chaput
3b1301eb7f
Fix container build when cache is disabled ( #26932 )
2023-09-15 10:44:01 +02:00