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

7783 Commits (a51cdd6b6dd7e5f7a8ef1ce0497c2943970e88a0)

Author SHA1 Message Date
Claire af06d74574
Fix keyboard shortcuts and navigation in grouped notifications (#31076) 2024-07-23 06:20:17 +00:00
Claire cbf25634a9 [Glitch] Fix reblogging after refactor 
Port 55705d8191 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire 643b1ef3e9 [Glitch] Refactor CW handling in an action 
Port 9cb9427133 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire f13a231b39 [Glitch] Refactor code for reblogging and favouriting 
Port 03dea64b79 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire dcfcfdcb14 Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream 2024-07-22 21:41:31 +02:00
Claire 55705d8191
Fix reblogging after refactor (#31105) 2024-07-22 19:30:06 +00: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 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
github-actions[bot] 5a60a3b80c
New Crowdin Translations (automated) (#31087) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-22 08:01:24 +00:00
Claire 95984b729a [Glitch] Remove routerHistory parameters from composer actions 
Port e768b23aa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-19 18:06:35 +02:00
Michael Stanclift 9f05a06dee [Glitch] Fix double border on column filter on narrow screens 
Port 784e088533 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-19 17:46:56 +02: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 2e63e802b3
Fix inconsistent padding in glitch-soc's grouped notifications (#2784) 2024-07-19 12:13:50 +02:00
Michael Stanclift 784e088533
Fix double border on column filter on narrow screens (#31068) 2024-07-19 08:30:26 +00:00
github-actions[bot] 8e0aed8ac7
New Crowdin Translations (automated) (#31072) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-19 08:21:09 +00:00
Renaud Chaput 7224e24054 [Glitch] Grouped Notifications UI 
Port f587ff643f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 19:55:02 +02: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
github-actions[bot] 7d090b2ab6
New Crowdin Translations (automated) (#31055) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-18 08:00:29 +00:00
Claire 5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
github-actions[bot] 00c110ac7b
New Crowdin Translations (automated) (#31047) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-17 07:23:07 +00:00
Claire c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
github-actions[bot] 66430cb25c
New Crowdin Translations (automated) (#31038) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-16 15:24:56 +00:00
Adam Niedzielski a609940ec9
Fix test description in hashtag_bar (#30827) 2024-07-16 13:23:26 +00:00
David Roetzel 70969ac64c [Glitch] Move filtered notifications bar in scrollable area 
Port 9d0bce4072 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-15 18:57:38 +02: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
github-actions[bot] 17117109ad
New Crowdin Translations (automated) (#31018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-15 07:44:37 +00:00
Claire 8d2a93b0cb [Glitch] Add setting to disable hover cards 
Port ad52b04a1c to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-12 13:50:42 +02:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
github-actions[bot] 28ad3588e4
New Crowdin Translations (automated) (#31006) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-12 08:25:27 +00: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
Renaud Chaput e26052192d [Glitch] Change disabled buttons color in light mode to make it more visible 
Port 8c8bee5a36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-11 21:08:20 +02:00
Claire db0b12e5dc Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream 2024-07-11 21:07:03 +02:00
Renaud Chaput 8c8bee5a36
Change disabled buttons color in light mode to make it more visible (#30998) 2024-07-11 13:43:42 +00:00
github-actions[bot] c244b70dc2
New Crowdin Translations (automated) (#30993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-11 10:38:35 +00:00
github-actions[bot] 182fee1c45
New Crowdin Translations (automated) (#2738) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-10 18:18:15 +02:00
Claire 959ad1d6be Fix deprecation warning in win95 theme 2024-07-10 17:46:33 +02:00
Renaud Chaput 0d4a8a53d5 [Glitch] Fix SCSS mixed declarations deprecation 
Port 182b9248c0 to glitch-soc
 2024-07-10 16:59:31 +02:00
Claire 52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
Renaud Chaput 182b9248c0
Fix SCSS mixed declarations deprecation (#30986) 2024-07-10 12:23:24 +00:00
github-actions[bot] 9984fca9a0
New Crowdin Translations (automated) (#30983) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-10 10:40:19 +00:00
Claire 388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
github-actions[bot] 249b4117f9
New Crowdin Translations (automated) (#30970) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-09 07:36:13 +00:00
Tianwei Dong 80179d53ba [Glitch] Change to use an unified constant for max media attachments per status 
Port 36d819bef3 to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-08 19:49:56 +02:00
Renaud Chaput aa8ad92fa4 [Glitch] Remove the `title` attribute when hovering a card anchor 
Port 981395e4d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-08 19:48:01 +02:00
Renaud Chaput 2fa3c3a748 [Glitch] Add the account hover card for account search results 
Port 0899c91d4b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-08 19:47:30 +02: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
github-actions[bot] 1a37862a76
New Crowdin Translations (automated) (#30940) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-08 08:03:44 +00:00
Renaud Chaput 981395e4d6
Remove the `title` attribute when hovering a card anchor (#30948) 2024-07-07 16:14:15 +00:00
Renaud Chaput 0899c91d4b
Add the account hover card for account search results (#30949) 2024-07-07 16:13:10 +00:00
Claire a99ae90d76 [Glitch] Fix overflow behavior on profile fields in hover cards 
Port 63ba69810e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-06 21:11:37 +02:00
Claire aca1decf54 [Glitch] Fix right-to-left text in preview cards 
Port 8f5694d79e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-06 21:11:17 +02: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 63ba69810e
Fix overflow behavior on profile fields in hover cards (#30928) 2024-07-06 07:22:24 +00:00
Claire 8f5694d79e
Fix right-to-left text in preview cards (#30930) 2024-07-05 13:40:53 +00:00
github-actions[bot] 81547845ac
New Crowdin Translations (automated) (#30925) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-05 09:09:40 +00:00
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
github-actions[bot] 8331f9e379
New Crowdin Translations (automated) (#30916) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-04 08:46:27 +00:00
Claire 70ff7a7c69 Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
github-actions[bot] dd85e3bcc5
New Crowdin Translations (automated) (#30901) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-03 07:30:30 +00:00
github-actions[bot] 1fc14e324b
New Crowdin Translations (automated) (#30890) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-02 08:41:54 +00:00
Claire 4d4f7ede4f Revert "Temporarily disable hover cards" 
This reverts commit 935b955b15.
 2024-07-01 21:21:22 +02:00
Eugen Rochko 4c5067e3a4 [Glitch] Add timeline of public posts about a trending link in web UI 
Port 20fa9ce484 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-01 21:19:38 +02:00
Eugen Rochko a70b1141d6 [Glitch] Fix missing confirmation when unfollowing from hover card in web UI 
Port d3f504245c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-01 20:55:56 +02:00
Eugen Rochko dcfd39991b [Glitch] Change hover cards to not appear until the mouse stops in web UI 
Port b728c0e8ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-01 20:50:26 +02: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 d270165be3 Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream 2024-07-01 12:05:39 +02:00
github-actions[bot] 7756db6551
New Crowdin Translations (automated) (#30873) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-01 08:34:38 +00:00
Aria 6d6064d2c0
fix(collapsing): fix and simplify post collapsing CSS (#2757) 2024-06-30 22:27:38 +02:00
Claire 935b955b15 Temporarily disable hover cards 2024-06-30 21:48:30 +02:00
Eugen Rochko 412e5ddcbf [Glitch] Fix follow button in hover cards not working when signed out in web UI 
Port ea6c455e81 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 18:41:48 +02:00
Eugen Rochko 98185247b8 [Glitch] Add hover cards in web UI 
Port e89317d4c1

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 18:41:48 +02:00
Eugen Rochko 4179f5fcf3 [Glitch] Change `author_account` to be `authors` in REST API 
Port 096057b845 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 17:33:23 +02:00
Eugen Rochko d612daee97 [Glitch] Convert `<ColumnHeader>` to Typescript 
Port 3939352e92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 17:33:23 +02:00
Renaud Chaput 8160a655a5 [Glitch] Convert `<Directory>` to Typescript / function component 
Port 863c470a2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 17:33:23 +02:00
Renaud Chaput 1ac4e64a3b [Glitch] Change light mode to apply CSS variables to the body 
Port 8c0ff6498e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 14:49:55 +02:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
renovate[bot] 1bccba1408
chore(deps): update dependency @testing-library/react to v16 (#30533) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-28 11:39:32 +00:00
github-actions[bot] a5134f2695
New Crowdin Translations (automated) (#30867) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-28 08:33:57 +00:00
Eugen Rochko ea6c455e81
Fix follow button in hover cards not working when signed out in web UI (#30864) 2024-06-27 22:01:40 +00:00
Eugen Rochko 096057b845
Change `author_account` to be `authors` in REST API (#30846) 2024-06-27 13:17:18 +00:00
github-actions[bot] 6d1c1fd684
New Crowdin Translations (automated) (#30851) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-27 08:00:04 +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
Renaud Chaput 8c0ff6498e
Change light mode to apply CSS variables to the body (#30839) 2024-06-25 21:57:22 +00:00
Claire 7d89d1f186 [Glitch] Fix API requests after #30818 
Port 2c7eed1fa1 to glitch-soc
 2024-06-25 19:07:42 +02:00
Claire 85e6efd351 Merge commit '2c7eed1fa1e7af72dd03a041a60f2cfd42e913e0' into glitch-soc/merge-upstream 2024-06-25 19:06:59 +02:00
Claire 2c7eed1fa1
Fix API requests after #30818 (#30837) 2024-06-25 16:53:03 +00:00
Renaud Chaput 3a20290915 [Glitch] Change `apiRequest` to accept both `params` and `data` 
Port 547e97945d
 2024-06-25 18:03:51 +02:00
Claire 6f2771cb32 Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream 2024-06-25 17:57:39 +02:00
Renaud Chaput 547e97945d
Change `apiRequest` to accept both `params` and `data` (#30818) 2024-06-25 13:45:41 +00:00
github-actions[bot] 052c90b8de
New Crowdin Translations (automated) (#30825) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-25 07:45:58 +00:00