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

22780 Commits (2379bfe3ea9f1612b865a45c547b9f96059d22ba)

Author SHA1 Message Date
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
Claire 8a5b57f668
Revert "Support JSON-LD named graph (#31288)" (#31355) 2024-08-09 13:48:54 +00:00
Claire cbdd8edf68
Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Christian Schmidt e29c401f77
Add lang attribute on preview card title (#31303) 2024-08-09 13:05:34 +00:00
Claire 994ef16b72
Bust CDN cache on media deletion (#31353) 2024-08-09 12:48:34 +00:00
Jeong Arm 9bae237792
Change confirmation prompt on trending management (#19626) 2024-08-09 12:47:02 +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
renovate[bot] 6e01a23e3b
Update dependency eslint-plugin-promise to v7 (#31120) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-08 19:31:00 +00:00
renovate[bot] f045ef8e92
Update dependency eslint-plugin-jsdoc to v50 (#31330) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-08 19:30:42 +00:00
Michael Stanclift 389549e783
Fix list creation textbox styling (#31348) 2024-08-08 19:23:15 +00:00
Renaud Chaput a207a1f7dc
Disable stylelint rules that are conflicting with Prettier (#31339) 2024-08-08 19:22:16 +00:00
Claire 42c9488032
Merge pull request #2808 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 079d681ac6
 2024-08-08 21:00:19 +02: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
Claire 079d681ac6
Fix uninitialized grouped notifications read marker on initial load (#31347) 2024-08-08 17:00:05 +00:00
github-actions[bot] 0e4d3c0403
New Crowdin Translations (automated) (#31337) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-08 13:54:10 +00:00
Claire 2edae5ea28
Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component (#31338) 2024-08-08 10:57:21 +00:00
Valtteri Laitinen a95fe931d7
Really fix duplicate border around search results (#31305) 2024-08-08 09:22:48 +00:00
Michael Stanclift 176ba984d4
Follow up tweaking of admin UI changes part 2 (#31268) 2024-08-08 09:21:54 +00:00
Claire ac9040b76b
Add explainer for filtered notifications from limited accounts (#31331) 2024-08-08 09:16:33 +00:00
Claire f8629367d2
Add unchangeable filtered notification setting for limited accounts (#31324) 2024-08-07 23:09:30 +00:00
Matt Jankowski 84c3cc4e5b
Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +00:00
Matt Jankowski 52a626f39b
Replace more `font-awesome` icons in `app/helpers` (#30962) 2024-08-07 22:53:15 +00:00
Matt Jankowski e4092cc73a
Replace more `font-awesome` icons in `views/settings` (#30963) 2024-08-07 22:52:35 +00:00