mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
23,394 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

4073 Commits

Author SHA1 Message Date
Claire 2b0410f903 Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-18 17:19:57 +02:00
Claire de5f522cc0 Remove ability to get embed code for remote posts (#32578) 2024-10-18 15:49:26 +02:00
hota 044dd3f788 Fix column-settings spacing in local timeline in advanced view (#32567) 2024-10-18 15:49:26 +02:00
github-actions[bot] d0fb7939bb
New Crowdin Translations for stable-4.3 (automated) (#32576) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-18 10:11:59 +02:00
Renaud Chaput e507b4f884 Add ability to group follow notifications in WebUI (#32520) 2024-10-18 09:14:13 +02:00
github-actions[bot] 93348136a5
New Crowdin Translations for stable-4.3 (automated) (#32555) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-17 10:21:47 +02:00
Claire 198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while
  glitch-soc has a different version of the file overall.
  Added upstream's changes.
 2024-10-16 12:42:12 +02:00
Renaud Chaput b01bd74698 Add back a 6 hours mute duration option (#32522) 2024-10-16 12:40:58 +02:00
Claire b091e531a5 Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3 2024-10-15 17:42:22 +02:00
Jeong Arm 49b3d5692e Fix reblog icons on account media view (#32506) 2024-10-15 17:37:14 +02:00
Claire 70472de726 Fix follow recommendation carrousel scrolling on RTL layouts, for real (#32505) 2024-10-15 17:37:14 +02:00
Claire a2e24ee2de Fix follow recommendation carrousel scrolling on RTL layouts (#32462) 2024-10-15 11:57:59 +02:00
Claire b40adb4a89 Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3 2024-10-14 19:18:08 +02:00
Claire a295832960 Fix mute duration not being shown in list of muted accounts in web UI (#32388) 2024-10-14 13:14:38 +02:00
Claire e018e6321f Fix “Mark every notification as read” not updating the read marker if scrolled down (#32385) 2024-10-14 13:14:38 +02:00
Claire f75eb1a8b0 Fix “Mention” appearing for otherwise filtered posts (#32356) 2024-10-14 13:14:38 +02:00
Claire 94c69bba25 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 2024-10-08 13:19:29 +02:00
github-actions[bot] ab36c152f9
New Crowdin Translations for stable-4.3 (automated) (#32297) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-08 13:18:49 +02:00
Claire 4a859140ec Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3 2024-10-07 20:03:53 +02:00
Eugen Rochko cae93e79a4 Fix missing avatar fallback interfering with transparency in web UI (#32270) 2024-10-07 16:22:11 +02:00
github-actions[bot] 2e0d918d7d
New Crowdin Translations for stable-4.3 (automated) (#32253) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-07 11:21:49 +02:00
Claire 3b4312476f Fix media gallery items having incorrect borders when hidden (#32257) 2024-10-07 10:54:23 +02:00
Claire 4fba4f8c82 Fix notification push notifications not including the author's username (#32254) 2024-10-07 10:54:23 +02:00
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Claire 6d5aa58f88 Fix unsupported grouped notifications from streaming causing duplicate IDs (#32243) 2024-10-04 17:48:03 +02:00
Claire 55b5364534 Hide badges in media gallery when media are hidden (#32224) 2024-10-04 17:48:03 +02:00
Claire 404f467fcf Fix editing description of media uploads with custom thumbnails (#32221) 2024-10-04 17:48:03 +02:00
Claire 931553844d Fix incorrect `'navigator'` check (#32219) 2024-10-04 17:48:03 +02:00
Renaud Chaput 8ac00533ff Fix follow notifications from streaming being grouped (#32179) 2024-10-04 17:48:03 +02:00
Claire 9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
github-actions[bot] f477dc399e
New Crowdin Translations (automated) (#32140) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-30 08:53:29 +00:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Eugen Rochko 11a12e56b3
Change media reordering design in the compose form in web UI (#32093) 2024-09-27 15:09:39 +00:00
github-actions[bot] c9b0699964
New Crowdin Translations (automated) (#32121) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-27 07:34:46 +00:00
Eugen Rochko a04433f995
Add ability to view alt text by clicking the ALT badge in web UI (#32058) 2024-09-26 13:26:49 +00:00
Claire 7a62d57427
Add fallback to domain block confirmation modal (#32105) 2024-09-26 12:47:56 +00:00
Eugen Rochko 89df27a06c
Change design of media tab on profiles in web UI (#31967) 2024-09-26 12:31:32 +00:00
github-actions[bot] 278a075b22
New Crowdin Translations (automated) (#32103) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-26 08:47:38 +00:00
Eugen Rochko 3426ea2912
Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Eugen Rochko 28c4eca0af
Change responsive break points on navigation panel in web UI (#32034) 2024-09-25 16:36:19 +00:00
Claire 633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput 739ad0eed2
Keep the status action buttons at their position regardless of the counter size (#32084) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-25 14:33:58 +00:00
Renaud Chaput d6f5ee75ab
Add notification grouping for follow notifications (#32085) 2024-09-25 13:36:19 +00:00
Renaud Chaput 3dc4ddc663
Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
github-actions[bot] 4e6fc3a62f
New Crowdin Translations (automated) (#32083) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-25 07:40:14 +00:00
Claire c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
Eugen Rochko 70988519df
Fix too many requests caused by relationship look-ups in web UI (#32042) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-24 17:02:36 +00:00
Claire 0a6b75b71e
Fix multiple bugs in notification requests and notification policies (#32062) 2024-09-24 15:03:38 +00:00
github-actions[bot] 11ac5c8929
New Crowdin Translations (automated) (#32052) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-24 09:42:14 +00:00
Claire c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00