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
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
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
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
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
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' 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
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' 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
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
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' 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
e14372c2d1
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' 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
2a4fcc51fd
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
Noa Himesaka
4f46a791d4
Jenkins change
2023-09-16 00:07:51 +09:00
Noa Himesaka
4dc3acf4e7
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-09-16 00:06:53 +09:00
Renaud Chaput
5d93e98da4
Fix container build when cache is disabled ( #26932 )
2023-09-15 10:44:01 +02:00
Claire
9693c271f1
Fix processing of min_id
and max_id
parameters in /api/v2/search
( #26927 )
2023-09-15 10:23:24 +02:00
renovate[bot]
82015dbab6
Update dependency sass to v1.67.0 ( #26914 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-15 10:03:55 +02:00
renovate[bot]
3103415364
Update dependency @babel/core to v7.22.19 ( #26920 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-15 09:09:22 +02:00
Renaud Chaput
ef8ca2fd72
Change Dockerfile to upgrade packages when building ( #26922 )
2023-09-14 23:11:36 +02:00
Claire
b90383d073
Bump version to v4.2.0-rc1 ( #26916 )
2023-09-14 18:46:00 +02:00
Eugen Rochko
fc6825055b
Change score half-life for trending posts from 2 hours to 1 hour ( #26915 )
2023-09-14 09:20:14 +02:00
Claire
a04ae16201
Fix CSP when using ONE_CLICK_SSO_LOGIN
( #26901 )
2023-09-13 19:54:04 +02:00
github-actions[bot]
921c6fe654
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-13 15:10:41 +02:00
Robert R George
20666482ef
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
renovate[bot]
97e4011c3c
Update dependency rails to v7.0.8 ( #26907 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-13 10:01:31 +02:00
Jeong Arm
97f3d7b662
Fix Version metadata have trailing dot ( #2403 )
2023-09-13 08:47:39 +02:00
Plastikmensch
075ee0b2d4
Fix wrong gradient color on collapsed private mentions ( #2402 )
...
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-09-13 08:44:40 +02:00
Claire
520b570474
Fix notification permissions being requested immediately after login ( #26472 )
2023-09-12 18:27:01 +02:00
Claire
287520453c
Fix front-end bug when processing relationship-related account actions ( #26902 )
2023-09-12 16:30:03 +02:00
CSDUMMI
9a70cac9de
Fix #26849 by adding the domain of the current SSO provider to the form-action CSP ( #26857 )
2023-09-12 13:04:51 +02:00
renovate[bot]
93223633fc
Update dependency uuid to v9.0.1 ( #26900 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-12 12:38:52 +02:00
Renaud Chaput
0712cc2b99
Fix Redux types ( #26899 )
2023-09-12 12:18:19 +02:00
renovate[bot]
9ac9aca142
Update dependency test-prof to v1.2.3 ( #26894 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-12 10:45:54 +02:00
Jeong Arm
59af3c1310
Add PublicStatuses to tootctl search deploy --only option ( #26896 )
2023-09-12 09:59:59 +02:00
Santiago Kozak
d2cfcdd09e
Fix recent search items not handling overflows correctly ( #26893 )
2023-09-12 04:20:57 +02:00
Claire
20ac5be1c1
Fix error on status
type notification (bell icon) ( #26884 )
2023-09-11 20:23:13 +02:00
Renaud Chaput
bd06c13204
Convert actions/account_notes
into Typescript ( #26601 )
2023-09-11 16:09:22 +02:00
renovate[bot]
7730083611
Update dependency kt-paperclip to v7.2.1 ( #26869 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 11:51:42 +02:00
renovate[bot]
f3be4eb0dc
Update dependency @rails/ujs to v7.0.8 ( #26871 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 11:32:30 +02:00
Noa Himesaka
7c9c042418
fix jenkins 2: electric boogaloo
2023-09-11 18:15:36 +09:00
Noa Himesaka
c9fa15214a
fix jenkins
2023-09-11 18:13:11 +09:00
renovate[bot]
3679e67fad
Update dependency @babel/core to v7.22.17 ( #26855 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 11:12:22 +02:00
Noa Himesaka
e522f64d0d
Use Jenkins!
2023-09-11 18:07:03 +09:00
renovate[bot]
c10142ac3c
Update formatjs monorepo ( #26874 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:54:59 +02:00
renovate[bot]
3d0331fc7a
Update actions/checkout action to v4 ( #26882 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:41:26 +02:00
renovate[bot]
b1d8907138
Update dependency @types/lodash to v4.14.198 ( #26878 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:26:23 +02:00