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

7977 Commits

Author SHA1 Message Date
mogaminsk
8c7642cd18
Change translation strings of grouped notification label to have full context (#31486) 2024-08-21 08:56:36 +00:00
github-actions[bot]
3994195fea
New Crowdin Translations (automated) (#31521)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-21 07:19:16 +00:00
Eugen Rochko
b06c7b6b5a
Change hints for missing remote content in web UI (#31516) 2024-08-21 07:08:58 +00:00
Claire
bdc0e0d27e [Glitch] Fix non-grouped notifications not loading on page load
Port 9ba7c90151 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 19:42:36 +02:00
Matt Jankowski
4c85fec993 [Glitch] Remove font-awesome npm package
Port 4c4bcad866 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:49:56 +02:00
Renaud Chaput
e19b3aaaba [Glitch] Update CSS color variables to match our latest design system
Port 4016fd5128 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:42:33 +02:00
Eugen Rochko
eb9405bed9 [Glitch] Fix margin in follow notification in web UI
Port 05b4380051 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:41:32 +02:00
Michael Stanclift
57c38b9156 [Glitch] Harmonize persistent scrollbar styles
Port 2f01f5f4ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:40:36 +02:00
Renaud Chaput
4e5d85b637 [Glitch] Improve the list selection UI for notification requests
Port 98bf2fc27c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:39:48 +02:00
Claire
f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
  Glitch-soc used this one but not upstream.
  Upstream pulled a presumably more up-to-date version of the file.
  Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/error.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
2024-08-20 18:31:50 +02:00
Claire
9ba7c90151
Fix non-grouped notifications not loading on page load (#31514) 2024-08-20 16:18:33 +00:00
Matt Jankowski
4c4bcad866
Remove font-awesome npm package (#31512) 2024-08-20 15:59:47 +00:00
Renaud Chaput
4016fd5128
Update CSS color variables to match our latest design system (#31510) 2024-08-20 15:56:44 +00:00
Eugen Rochko
05b4380051
Fix margin in follow notification in web UI (#31508) 2024-08-20 14:03:09 +00:00
Matt Jankowski
fa2e7b1708
Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
Matt Jankowski
71405eabfc
Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
github-actions[bot]
c75f7262ed
New Crowdin Translations (automated) (#31504)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-20 07:59:21 +00:00
Michael Stanclift
2f01f5f4ea
Harmonize persistent scrollbar styles (#31445) 2024-08-20 07:48:51 +00:00
Renaud Chaput
98bf2fc27c
Improve the list selection UI for notification requests (#31457) 2024-08-19 22:11:58 +00:00
Claire
bfd01110d8 [Glitch] Reload notifications when accepted notifications are merged (streaming only)
Port 53c183f899 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:43:57 +02:00
Claire
99ffae7d44 [Glitch] Refactor some actions to be proper async actions instead of passing a continuation
Port 1e612c5a09 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:43:24 +02:00
Emelia Smith
a7751d26e7 [Glitch] Disable rule selector in ReportReasonSelector if instance has no rules
Port 71f257d529 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:34:06 +02:00
Claire
1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) (#31419) 2024-08-19 15:59:06 +00:00
Claire
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation (#31453) 2024-08-19 14:41:32 +00:00
Emelia Smith
71f257d529
Disable rule selector in ReportReasonSelector if instance has no rules (#31458) 2024-08-19 12:28:06 +00:00
github-actions[bot]
c4e0a7dced
New Crowdin Translations (automated) (#31463)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-19 08:29:48 +00:00
Renaud Chaput
ceeabffee5 [Glitch] Add a follow button & follower count on follow notifications
Port 32a78e56e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-16 20:09:01 +02:00
Claire
3ea00508ac Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream 2024-08-16 20:06:59 +02:00
Renaud Chaput
32a78e56e0
Add a follow button & follower count on follow notifications (#31433) 2024-08-16 10:00:59 +00:00
github-actions[bot]
9a24552732
New Crowdin Translations (automated) (#31440)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-16 09:11:33 +00:00
Michael Stanclift
104c378cb4 [Glitch] Modify profile directory page image borders
Port 9194197de5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-15 21:59:08 +02:00
Claire
9f2775830c Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream 2024-08-15 21:58:04 +02:00
Michael Stanclift
0dbdf6a7f3 [Glitch] Fix removal of border from account listing
Port a1ddaa9ee9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:28:16 +02:00
Renaud Chaput
524fc8563b [Glitch] Fix notification screen crashing in rare cases where the status no longer exists
Port 0d85a79f19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:26:51 +02:00
Michael Stanclift
cf96857038 [Glitch] Fix collapsable column borders in Safari and improve Safari scrollbars
Port 7d4b602cb2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:25:45 +02:00
Claire
bf0129968e [Glitch] Fix styling of notification browser permission denied banner
Port 12582d095e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:25:16 +02:00
Renaud Chaput
09929a42f7 [Glitch] Fix log out from user menu not working on Safari
Port c3e1d86d58 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:24:50 +02:00
Michael Stanclift
9194197de5
Modify profile directory page image borders (#31391) 2024-08-14 19:23:45 +00:00
Claire
a190efcd6d [Glitch] Fix modal border and padding inconsistencies
Port 2b1670da48 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:23:10 +02:00
Renaud Chaput
072f560174 [Glitch] Change avatars border radius
Port f6d090fdf5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:22:42 +02:00
Renaud Chaput
d3db2d04ad [Glitch] Add a border above the timeline hint for statuses with replies
Port 7e501c59c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:22:07 +02:00
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
Michael Stanclift
a1ddaa9ee9
Fix removal of border from account listing (#31432) 2024-08-14 17:09:23 +00:00
github-actions[bot]
202f43ccc6
New Crowdin Translations (automated) (#31411)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-14 07:04:01 +00:00
Renaud Chaput
0d85a79f19
Fix notification screen crashing in rare cases where the status no longer exists (#31403) 2024-08-14 06:47:15 +00:00
Michael Stanclift
7d4b602cb2
Fix collapsable column borders in Safari and improve Safari scrollbars (#31389) 2024-08-13 21:54:03 +00:00
Claire
12582d095e
Fix styling of notification browser permission denied banner (#31406) 2024-08-13 19:32:27 +00:00
Renaud Chaput
c3e1d86d58
Fix log out from user menu not working on Safari (#31402) 2024-08-13 17:49:23 +00:00
Claire
2b1670da48
Fix modal border and padding inconsistencies (#31399) 2024-08-13 17:48:28 +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
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
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
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