1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 07:09:03 +09:00
Commit Graph

22663 Commits

Author SHA1 Message Date
Claire
2ed13071ef
Fix what was intended as a comment being interpreted as strings (#31398) 2024-08-13 08:48:10 +00:00
github-actions[bot]
862e793b45
New Crowdin Translations (automated) (#31394)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-13 07:42:08 +00:00
Matt Jankowski
02df1b4e4a
Finish email allow/deny list naming migration (#30530) 2024-08-13 07:37:32 +00:00
Renaud Chaput
f6d090fdf5
Change avatars border radius (#31390) 2024-08-13 07:26:23 +00:00
Renaud Chaput
7e501c59c2
Add a border above the timeline hint for statuses with replies (#31387) 2024-08-13 07:14:41 +00:00
Claire
115fb0a513
Merge pull request #2811 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to b42661ba95
2024-08-12 19:37:25 +02:00
Claire
8426c20d34 [Glitch] Fix all streamed notification types being stored without filtering
Port a7b718c31a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:51:54 +02:00
Michael Stanclift
61b2139267 [Glitch] Fix account header avatar border
Port fbdda9f6c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:51:25 +02:00
Michael Stanclift
47df10e9ed [Glitch] Revert Safari scrollbar changes
Port 7365a13ee7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:50:25 +02:00
Essem
939af853e6 [Glitch] Fix extra slash on notification policy request
Port 2e03dc9fbf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:49:55 +02:00
Claire
83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
Emelia Smith
b42661ba95
Add missing Appeals link under Moderation in navigiation (#31071) 2024-08-12 14:45:30 +00:00
Emelia Smith
a1f723a6a4
Add support for PKCE Extension in OmniAuth OIDC (#31131) 2024-08-12 14:32:52 +00:00
Claire
a7b718c31a
Fix all streamed notification types being stored without filtering (#31384) 2024-08-12 13:40:29 +00:00
Django
709dcd07f2
Add support for incoming <s> tag (#31375) 2024-08-12 11:10:05 +00:00
github-actions[bot]
3abb5c0eaa
New Crowdin Translations (automated) (#31382)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-12 07:22:50 +00:00
Michael Stanclift
fbdda9f6c1
Fix account header avatar border (#31373) 2024-08-11 21:32:22 +00:00
Michael Stanclift
7365a13ee7
Revert Safari scrollbar changes (#31372) 2024-08-11 21:30:52 +00:00
Essem
2e03dc9fbf
Fix extra slash on notification policy request (#31378) 2024-08-11 21:28:43 +00:00
Claire
9edf98c02a
Merge pull request #2810 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 85152af95f
2024-08-11 22:02:50 +02:00
Renaud Chaput
dff29c83c5 [Glitch] Fix typos in localisation from #31342
Port 19dbc74d82 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-11 21:12:24 +02:00
Emelia Smith
4515bf9d45 [Glitch] Move Follow Recommendations to Trends menu, rename to Recommendations & Trends
Port SCSS changes from d3089018d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-11 21:11:09 +02:00
Matt Jankowski
f299f8bac1 [Glitch] Use material symbol for responsive menu toggle
Port SCSS changes from 7519ef2fa1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-11 21:10:29 +02:00
Michael Stanclift
d6e340b4dd [Glitch] Improve legibility of account/hashtag autosuggest
Port caf0164f00 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-11 21:09:46 +02:00
Claire
f441b280dc Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream 2024-08-11 21:05:09 +02:00
github-actions[bot]
85152af95f
New Crowdin Translations (automated) (#31377)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-11 18:51:39 +00:00
github-actions[bot]
634ab0bad0
New Crowdin Translations (automated) (#31351)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-11 18:13:10 +00:00
Renaud Chaput
19dbc74d82
Fix typos in localisation from #31342 (#31369) 2024-08-10 18:14:37 +00:00
Robin
c39a8e1061
Change “e-mail” to “email” in en.yml (#31317) 2024-08-10 09:32:57 +00:00
Emelia Smith
d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
Matt Jankowski
885e67b2ed
Use material symbol for modal layout sign out link (#31363) 2024-08-10 09:13:08 +00:00
Matt Jankowski
7519ef2fa1
Use material symbol for responsive menu toggle (#31362) 2024-08-10 09:12:47 +00:00
Michael Stanclift
caf0164f00
Improve legibility of account/hashtag autosuggest (#31361) 2024-08-10 09:11:34 +00:00
Claire
e6feabf6c5
Merge pull request #2809 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 28411acebb
2024-08-09 19:33:08 +02:00
Claire
082c71f4ea [Glitch] Fix “Accept all”/“Dismiss all” notification requests not working
Port 28411acebb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 18:59:36 +02:00
Travis Briggs
57a6307228 [Glitch] Add hint to user that other remote statuses may not be displayed
Port bcec8f53a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 18:56:34 +02:00
Claire
f43a4842f7 Merge commit '28411acebb5626acf43b44a7b6c33ac783156f72' into glitch-soc/merge-upstream 2024-08-09 18:51:31 +02:00
Claire
28411acebb
Fix “Accept all”/“Dismiss all” notification requests not working (#31358) 2024-08-09 16:40:15 +00:00
Travis Briggs
bcec8f53a4
Add hint to user that other remote statuses may not be displayed (#26910) 2024-08-09 16:12:51 +00:00
Claire
b6961d08ab [Glitch] Add ability to report, block and mute from notification requests list
Port 658addcbf7 to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:25:08 +02:00
Claire
58b9b80be5 [Glitch] Add option to ignore filtered notifications to the web interface
Port 1701575704 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:24:11 +02:00
Michael Stanclift
99d38167a3 [Glitch] Fix post filter & report styling
Port 9538d9c298 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:22:11 +02:00
Claire
ce9715d651 [Glitch] Change unread notification count to only cover the selected notification type
Port 6ca731e9b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:21:48 +02:00
Renaud Chaput
5a9f526a17 [Glitch] Update notification labels for mentions
Port 2095d0f2b0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:21:16 +02:00
Michael Stanclift
e7be55fd73 [Glitch] Fix list creation textbox styling
Port 389549e783 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:19:54 +02:00
Michael Stanclift
cc2949b797 [Glitch] Fix styling issues with notification settings and mobile borders
Port 664bef3573 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-09 17:19:26 +02:00
Claire
31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire
658addcbf7
Add ability to report, block and mute from notification requests list (#31309)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-08-09 14:56:39 +00:00
Claire
eaedd52def
Fix incorrect rate limit on PUT requests (#31356) 2024-08-09 14:48:05 +00:00
Claire
1701575704
Add option to ignore filtered notifications to the web interface (#31342) 2024-08-09 14:21:55 +00:00