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

8197 Commits

Author SHA1 Message Date
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
Claire a20f38c930 Fix only the first paragraph being displayed in some notifications (#32348) 2024-10-16 12:40:58 +02:00
Renaud Chaput b01bd74698 Add back a 6 hours mute duration option (#32522) 2024-10-16 12:40:58 +02:00
Jeong Arm 12297faa1d [Glitch] Fix reblog icons on account media view 
Port 49b3d5692e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-15 17:49:40 +02:00
Claire 9b6f92e47f [Glitch] Fix follow recommendation carrousel scrolling on RTL layouts, for real 
Port 70472de726 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-15 17:49:40 +02:00
Renaud Chaput 8b6247ca44 [Glitch] Fix back arrow pointing to the incorrect direction in RTL languages 
Port ca68a3cacb

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-15 17:49:40 +02:00
Claire 836cbca469 [Glitch] Fix follow recommendation carrousel scrolling on RTL layouts 
Port a2e24ee2de to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-15 17:49:20 +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
Renaud Chaput ca68a3cacb Fix back arrow pointing to the incorrect direction in RTL languages (#32485) 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 782a785893 [Glitch] Fix mute duration not being shown in list of muted accounts in web UI 
Port a295832960 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-14 19:24:11 +02:00
Claire 9f165436d2 [Glitch] Fix “Mark every notification as read” not updating the read marker if scrolled down 
Port e018e6321f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-14 19:23:38 +02:00
Claire 592945e498 [Glitch] Fix “Mention” appearing for otherwise filtered posts 
Port f75eb1a8b0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-14 19:23:18 +02:00
Michael Stanclift bfb610922d [Glitch] Restore list column border 
Port de4f7859b4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-14 19:22:54 +02:00
Claire 480dcecc11 [Glitch] Fix list edition modal styling 
Port 45a520603b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-14 19:22:35 +02:00
Matt Jankowski 2647606a15 [Glitch] Bring icon vertical middle to applications list style 
Port fa4a82326d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-14 19:22:02 +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
Michael Stanclift de4f7859b4 Restore list column border (#32367) 2024-10-14 13:14:38 +02:00
Claire 45a520603b Fix list edition modal styling (#32358) 2024-10-14 13:14:38 +02:00
Claire 6ac78ead52 Fix 4 columns barely not fitting on 1920px screen (#32361) 2024-10-14 13:14:38 +02:00
Matt Jankowski fa4a82326d Bring icon vertical middle to applications list style (#32293) 2024-10-14 13:14:38 +02:00
Claire 93fa102f9a Fix setting to hide the quick filter bar (#2882) 
Fixes #2881
 2024-10-11 17:45:31 +02:00
Claire 9ee86a738e Fix the favicon notification badge not using the correct notification count (#2880) 
Fixes #2879
 2024-10-10 19:35:55 +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
Eugen Rochko f669493d96 [Glitch] Fix missing avatar fallback interfering with transparency in web UI 
Port cae93e79a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-07 20:13:58 +02:00
Eugen Rochko 83b3c50778 [Glitch] Fix wrong width on logo in detailed link card in web UI 
Port 889edc560a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-07 20:06:49 +02:00
Claire dc7a42551f [Glitch] Fix media gallery items having incorrect borders when hidden 
Port 3b4312476f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-07 20:06:14 +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
Eugen Rochko 889edc560a Fix wrong width on logo in detailed link card in web UI (#32271) 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 026643ab24 Fix video player's height in detailed status view 2024-10-06 19:19:14 +02:00
Claire 354f54907d [Glitch] Fix unsupported grouped notifications from streaming causing duplicate IDs 
Port 6d5aa58f88 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:05:55 +02:00
Claire 4d611e94ee [Glitch] Hide badges in media gallery when media are hidden 
Port 55b5364534 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:05:15 +02:00
Claire a09a26da49 [Glitch] Fix editing description of media uploads with custom thumbnails 
Port 404f467fcf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:04:52 +02:00
Claire 59a8066045 [Glitch] Fix media uploads in composer appearing over search results in advanced interface 
Port 4a2d3929c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:04:31 +02:00
Claire 3cad5095c9 [Glitch] Fix incorrect `'navigator'` check 
Port 931553844d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:04:09 +02:00
Matt Jankowski e58d99a771 [Glitch] Adjust spacing on setting sub-nav items when below mobile size 
Port 09cf617d7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:03:45 +02:00
Matt Jankowski 69c76fd94a [Glitch] Improve alignment of icons on admin roles list 
Port c828e7731c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:03:22 +02:00
Renaud Chaput 1b6bd585ab [Glitch] Fix follow notifications from streaming being grouped 
Port 8ac00533ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-05 21:00:39 +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