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

13683 Commits

Author SHA1 Message Date
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
Matt Jankowski
a6df125303
Fix Rails/CompactBlank cop (#31581) 2024-08-26 07:35:33 +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
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI (#31365) 2024-08-22 17:12:35 +00:00
Claire
98237207e6
Fix unnecessary “next” link when API returns fewer notification requests than requested (#31541) 2024-08-22 13:42:04 +00:00
Claire
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded (#31540) 2024-08-22 13:42:02 +00:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint (#30205) 2024-08-22 10:04:27 +00:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533) 2024-08-22 08:42:33 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) (#31536)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-22 08:04:56 +00:00
Claire
1e814f58cc [Glitch] Remove dead CSS code
Port 2da687a28b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 20:33:39 +02:00
Claire
fa2e758152 Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream 2024-08-21 20:32:02 +02:00
Claire
2da687a28b
Remove dead CSS code (#31527) 2024-08-21 17:05:02 +00:00
Claire
3ffdb7cdac [Glitch] Remove fontawesome leftovers
Port edeae945c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 18:52:40 +02:00
Claire
24849cdb1f [Glitch] Add automatic notification polling for grouped notifications
Port d67e11733e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 18:51:27 +02:00
KMY(雪あすか)
a9cef5c324 [Glitch] Fix boost dialog visibility selection not being taken into account
Port 01a757d306 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 18:50:44 +02:00
Claire
66bc8d5717 [Glitch] Fix distracting and confusing always-showing scrollbar track in boost confirmation modal
Port e48a64d3b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 18:50:17 +02:00
mogaminsk
b2e6f11b81 [Glitch] Change translation strings of grouped notification label to have full context
Port 8c7642cd18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 18:49:54 +02:00
Eugen Rochko
bae0b81779 [Glitch] Change hints for missing remote content in web UI
Port b06c7b6b5a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-21 18:49:02 +02:00
Claire
0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
Claire
edeae945c0
Remove fontawesome leftovers (#31525) 2024-08-21 15:55:35 +00:00
Claire
19a1acb38b
Add api_versions to /api/v2/instance (#31354) 2024-08-21 14:54:59 +00:00
Claire
d67e11733e
Add automatic notification polling for grouped notifications (#31513) 2024-08-21 14:41:31 +00:00
KMY(雪あすか)
01a757d306
Fix boost dialog visibility selection not being taken into account (#31523) 2024-08-21 13:11:36 +00:00
Claire
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal (#31524) 2024-08-21 10:25:14 +00:00
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