1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-04 09:48:44 +09:00
Commit Graph

7995 Commits

Author SHA1 Message Date
Claire
1fb31ad9b1 [Glitch] Fix display name being displayed instead of domain in remote reports
Port 585e369e0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-04 19:43:21 +02:00
Claire
1d86377ba9 [Glitch] Fix all notification types being stored without filtering when polling
Port fab29ebbe8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-04 19:42:45 +02:00
Claire
5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
2024-09-04 19:38:52 +02:00
Claire
585e369e0b
Fix display name being displayed instead of domain in remote reports (#31613) 2024-09-04 13:43:08 +00:00
Claire
fab29ebbe8
Fix all notification types being stored without filtering when polling (#31745) 2024-09-04 13:28:16 +00:00
github-actions[bot]
1c17dca6d9
New Crowdin Translations (automated) (#31741)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-04 08:42:36 +00:00
Christian Schmidt
8e3c47aff5 [Glitch] frequentlyUsedLanguages not updated correctly
Port 8adf67f2db to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-03 21:55:32 +02:00
Claire
663cebbe3b [Glitch] Fix radio buttons styling in web UI
Port 0437dd9e77 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-03 21:54:41 +02:00
Claire
fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
Christian Schmidt
8adf67f2db
frequentlyUsedLanguages not updated correctly (#31386) 2024-09-03 15:55:13 +00:00
Claire
0437dd9e77
Fix radio buttons styling in web UI (#31723) 2024-09-03 11:37:09 +00:00
Claire
e9adba60af [Glitch] Fix not being able to load more notifications after trimming
Port c1795ee963 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-03 12:13:19 +02:00
Claire
ac4002fe08 Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream 2024-09-03 12:12:23 +02:00
github-actions[bot]
e5155c50fd
New Crowdin Translations (automated) (#31716)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-03 08:02:08 +00:00
Claire
c1795ee963
Fix not being able to load more notifications after trimming (#31652) 2024-09-02 20:14:04 +00:00
Claire
402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
github-actions[bot]
2f2b98c8cb
New Crowdin Translations (automated) (#31671)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-02 08:35:09 +00:00
Claire
b06907e4e4
Rewrite favourite modal as a Typescript functional component, use revamped design (#2831) 2024-08-31 18:41:25 +02:00
Claire
ee2c38fcb8 [Glitch] Change background color of notifications on private messages
Port 3ddeaca863 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-31 16:10:55 +02:00
Claire
4f1da814a8 [Glitch] Fix inconsistencies between code and notification source translation strings
Port 35538fe694 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-31 16:10:26 +02:00
Claire
6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
Claire
3ddeaca863
Change background color of notifications on private messages (#31657) 2024-08-30 09:42:48 +00:00
Claire
35538fe694
Fix inconsistencies between code and notification source translation strings (#31658) 2024-08-30 09:37:39 +00:00
github-actions[bot]
92eba9096b
New Crowdin Translations (automated) (#31656)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-30 07:12:56 +00:00
github-actions[bot]
5d725b2c12
New Crowdin Translations (automated) (#31647)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-29 08:30:39 +00:00
HolgerHuo
3c412578c9
update: max_media_attachments follow server advertised value (#31616) 2024-08-28 09:28:48 +00:00
github-actions[bot]
26d6d291c3
New Crowdin Translations (automated) (#31627)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-28 08:59:15 +00:00
Claire
435ff8e550 [Glitch] Add ability for admins to force grouped notifications in web UI
Port c73868cd78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-27 20:33:50 +02:00
Eugen Rochko
e15fad27bc [Glitch] Change design of boost modal in web UI
Port 29b9642b31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-27 20:33:50 +02:00
Emelia Smith
d3629d191f [Glitch] Add quick links to Administration and Moderation Reports from Web UI
Port d820c0883d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-27 20:16:52 +02:00
Claire
94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
Claire
33ad67fcea Fix target account link in old report notifications 2024-08-27 18:11:14 +02:00
Claire
c73868cd78
Add ability for admins to force grouped notifications in web UI (#31610) 2024-08-27 14:55:51 +00:00
github-actions[bot]
0e7c88aa6d
New Crowdin Translations (automated) (#31609)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-27 07:54:58 +00:00
Eugen Rochko
29b9642b31
Change design of boost modal in web UI (#31555) 2024-08-26 17:12:17 +00:00
Claire
2379bfe3ea [Glitch] Fix spurious loading bar middleware usage
Port e38ce3beb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-26 18:54:27 +02:00
Claire
11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Emelia Smith
d820c0883d
Add quick links to Administration and Moderation Reports from Web UI (#24838) 2024-08-26 16:42:46 +00:00
Claire
e38ce3beb7
Fix spurious loading bar middleware usage (#31592) 2024-08-26 16:38:34 +00:00
github-actions[bot]
626d44b6c6
New Crowdin Translations (automated) (#31572)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-26 07:25:39 +00:00
Claire
d0529b810a Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream 2024-08-24 12:06:31 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) (#31559)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-23 08:59:31 +00:00
Claire
532b53eece Fix assets build issue due to slightly different webpack config 2024-08-22 22:23:06 +02:00
Claire
e18bd0450a Extract strings removed upstream 2024-08-22 22:17:33 +02:00
Claire
7ce079cd26 [Glitch] Fix missing CSS in moderation interface
Port e08d22724d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-22 22:11:48 +02:00
Claire
dc70ef25b2 Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream 2024-08-22 22:09:10 +02:00
Claire
e08d22724d
Fix missing CSS in moderation interface (#31550) 2024-08-22 18:57:22 +00:00
Claire
9f2d3c721c [Glitch] Hide multiple selection bar for notification requests when no notificion requests are loaded
Port abe292b0ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-22 20:00:19 +02:00
Emelia Smith
37f20514d3 [Glitch] Add button to view the Hashtag on the instance from Hashtags in Moderation UI
Port 376088f6da to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-22 19:59:37 +02:00
Claire
18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
2024-08-22 19:54:20 +02:00