mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,606 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

7873 Commits (61b2139267249e73596fd5991115125c3d2650e5)

Author SHA1 Message Date
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
Claire a7b718c31a
Fix all streamed notification types being stored without filtering (#31384) 2024-08-12 13:40:29 +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
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
Emelia Smith d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +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 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 1701575704
Add option to ignore filtered notifications to the web interface (#31342) 2024-08-09 14:21:55 +00:00
Michael Stanclift 9538d9c298
Fix post filter & report styling (#31349) 2024-08-09 12:45:39 +00:00
Claire 6ca731e9b6
Change unread notification count to only cover the selected notification type (#31326) 2024-08-08 20:20:52 +00:00
Renaud Chaput 2095d0f2b0
Update notification labels for mentions (#31304) 2024-08-08 20:20:35 +00:00
Michael Stanclift 389549e783
Fix list creation textbox styling (#31348) 2024-08-08 19:23:15 +00:00
Claire dad9baaa54 [Glitch] Fix uninitialized grouped notifications read marker on initial load 
Port 079d681ac6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 20:02:19 +02:00
Claire 29db81e1bb [Glitch] Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component 
Port 2edae5ea28 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 20:01:48 +02:00
Valtteri Laitinen eacfb9fc55 [Glitch] Really fix duplicate border around search results 
Port a95fe931d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 19:59:04 +02:00
Michael Stanclift e01f4378e1 [Glitch] Follow up tweaking of admin UI changes part 2 
Port 176ba984d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 19:58:39 +02:00
Claire 3ef5adc526 [Glitch] Add explainer for filtered notifications from limited accounts 
Port ac9040b76b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 19:57:48 +02:00
Claire ca6ad45121 [Glitch] Add unchangeable filtered notification setting for limited accounts 
Port f8629367d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 19:57:22 +02:00
Matt Jankowski 48e4c57905 [Glitch] Replace more `font-awesome` icons in `views/admin` area 
Port 84c3cc4e5b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 19:56:58 +02:00
Matt Jankowski 15dc195029 [Glitch] Add material design icons to admin/settings views 
Port 32ead51e5a to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-08-08 19:56:17 +02:00
Michael Stanclift 664bef3573
Fix styling issues with notification settings and mobile borders (#31346) 2024-08-08 17:31:06 +00:00
Claire dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
 2024-08-08 19:30:16 +02:00