mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-17 16:18:36 +09:00
Code
23,200 Commits 1 Branch 1 Tag 337 MiB
f610fdd6e7
Commit Graph

1956 Commits

Author SHA1 Message Date
Claire
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation (#31453) 2024-08-19 14:41:32 +00: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
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02: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
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
Renaud Chaput
7e501c59c2
Add a border above the timeline hint for statuses with replies (#31387) 2024-08-13 07:14:41 +00:00
Claire
f441b280dc Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream 2024-08-11 21:05:09 +02:00
Renaud Chaput
19dbc74d82
Fix typos in localisation from #31342 (#31369) 2024-08-10 18:14:37 +00: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
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
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
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
2edae5ea28
Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component (#31338) 2024-08-08 10:57:21 +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
Claire
06e034db15 Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream 2024-08-07 19:22:25 +02:00
Claire
6f285bb2a6
Change group notifications unread markers to only be cleared when focusing/navigating again (#31325) 2024-08-07 11:12:42 +00:00
Claire
08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
Renaud Chaput
97b9e8befd
Add account notes to hover cards (#31300) 2024-08-06 06:53:59 +00:00
Renaud Chaput
19f4aa1147
Fix typo in english message (filtred => filtered) (#31273) 2024-08-02 19:55:13 +00:00
Claire
e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 2024-08-02 18:09:48 +02:00
Claire
ad95c98054
Further de-emphasize filtered notifications banner and add setting to minimize it (#31250) 2024-08-02 14:59:37 +00:00
Renaud Chaput
cc453f2221
Change the filtered notification count to be in the account avatar (#31262) 2024-08-02 13:18:19 +00:00
Claire
8dd671a977 Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
Claire
2c1e75727d
Change filtered notification banner design to take up less space (#31222) 2024-07-31 12:36:08 +00:00
Claire
288961bbb9
Change private mention icon for consistency in grouped notifications (#31223) 2024-07-31 10:26:43 +00:00
Claire
fd1bade135
Fix inconsistent dismiss icon for notification requests (#31220) 2024-07-31 07:52:59 +00:00
Claire
fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
Eugen Rochko
8818748b90
Change design of confirmation modals in web UI (#30884) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-25 17:05:54 +00:00
Claire
68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Claire
a8330be93e
Widen the clickable area for statuses in grouped notifications (#31111) 2024-07-23 12:11:08 +00:00
Claire
af06d74574
Fix keyboard shortcuts and navigation in grouped notifications (#31076) 2024-07-23 06:20:17 +00:00
Claire
dcfcfdcb14 Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream 2024-07-22 21:41:31 +02:00
Claire
9cb9427133
Refactor CW handling in an action (#31103) 2024-07-22 16:03:58 +00:00
Claire
03dea64b79
Refactor code for reblogging and favouriting (#31102) 2024-07-22 15:45:07 +00:00
Claire
f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Claire
e768b23aa9
Remove routerHistory parameters from composer actions (#31077) 2024-07-19 15:26:44 +00:00
Claire
c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Renaud Chaput
f587ff643f
Grouped Notifications UI (#30440) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 14:36:09 +00:00
Claire
64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
David Roetzel
9d0bce4072
Move filtered notifications bar in scrollable area (#30996) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-15 13:42:47 +00:00
Claire
55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
Claire
ad52b04a1c
Add setting to disable hover cards (#30931) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-11 19:42:58 +00:00
Claire
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
Tianwei Dong
36d819bef3
Change to use an unified constant for max media attachments per status (#29073) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-08 08:10:57 +00:00
Claire
11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
Claire
8f5694d79e
Fix right-to-left text in preview cards (#30930) 2024-07-05 13:40:53 +00:00
Claire
92dcc50278 Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream 2024-07-01 20:45:13 +02:00
Eugen Rochko
d3f504245c
Fix missing confirmation when unfollowing from hover card in web UI (#30879) 2024-07-01 18:10:22 +00:00
Eugen Rochko
b728c0e8ce
Change hover cards to not appear until the mouse stops in web UI (#30850) 2024-07-01 15:52:01 +00:00
Eugen Rochko
20fa9ce484
Add timeline of public posts about a trending link in web UI (#30840) 2024-07-01 14:45:48 +00:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Eugen Rochko
096057b845
Change author_account to be authors in REST API (#30846) 2024-06-27 13:17:18 +00:00
Eugen Rochko
3939352e92
Convert <ColumnHeader> to Typescript (#30849) 2024-06-26 19:46:28 +00:00
Eugen Rochko
e89317d4c1
Add hover cards in web UI (#30754) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-26 19:33:38 +00:00
Renaud Chaput
863c470a2b
Convert <Directory> to Typescript / function component (#30829) 2024-06-26 18:04:50 +00:00
Claire
fd867adffe Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +02:00
Renaud Chaput
1c65932776
Convert disconnectTimeline and timelineDelete actions to Typescript (#30777) 2024-06-20 11:56:52 +00:00
Claire
b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
Renaud Chaput
d558dfd77d
Convert notifications policies frontend code to Typescript (#29868) 2024-06-18 13:23:30 +00:00
Claire
395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Claire
8089fa6935 Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's different theming system.
  Ported upstream's change.
 2024-06-17 18:14:14 +02:00
Claire
677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Eugen Rochko
b9fd7571ae
Change sidebar text in web UI (#30696) 2024-06-14 13:04:20 +00:00
Marcin Mikołajczak
a243963e93
LanguageDropdown: remove unused function (#30346) 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-06-13 19:46:45 +00:00
Eugen Rochko
ed6d24330b
Add author links on the explore page in web UI (#30521) 2024-06-13 13:04:16 +00:00
Claire
30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Eugen Rochko
3c435f9ba0
Change counters to be displayed on profile timelines in web UI (#30525) 2024-06-05 23:52:46 +00:00
Claire
c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag (#30398) 2024-05-29 01:34:33 +02:00
Renaud Chaput
3750e8050c
Enable stricter Typescript options (#30435) 2024-05-27 09:24:59 +00:00
Claire
d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
Renaud Chaput
8ea2726376
Fix a leftover argument to api() (#30405) 2024-05-24 08:25:42 +00:00
Claire
51631c785f Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes.
 2024-05-23 20:30:23 +02:00
Renaud Chaput
b6fd14f0e2
Fix createDataLoadingThunk and related actions (#30408) 2024-05-23 18:22:42 +00:00
Renaud Chaput
10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests (#30270) 2024-05-23 09:50:13 +00:00
Claire
e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
Renaud Chaput
a178ba7cd5
Use a modern React context for identity in the app (#30098) 2024-05-19 17:07:32 +00:00
Claire
f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Chee Aun
c36a8786c1
Fix typo (#30224) 2024-05-10 09:19:27 +00:00
Claire
f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
 2024-05-04 16:12:51 +02:00
Claire
d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Claire
b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire
946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire
6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire
2c386d4cfe Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire
0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.
 2024-05-01 16:10:45 +02:00
Claire
3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire
a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`

All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.

Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
 2024-05-01 14:25:47 +02:00
Claire
7d3fe2b4c3
Add loading indicator and empty result message to advanced interface search (#30085) 2024-04-29 09:55:41 +00:00
Claire
de4a7bf531
Change moderation warning notification icon (#30081) 2024-04-26 15:33:15 +00:00
Claire
4ef0b48b95
Add in-app notifications for moderation actions/warnings (#30065) 2024-04-25 17:26:05 +00:00
Eugen Rochko
0ec061aa8f
Change design of people tab on explore in web UI (#30059) 2024-04-25 16:25:33 +00:00