mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,130 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

8082 Commits (86b9d3b4e5f95be5a97924e4787a92112c6e6f11)

Author SHA1 Message Date
Claire 86b9d3b4e5 [Glitch] Fix custom `history.push` and `history.replace` building bogus location if path is omitted 
Port 57a38f071b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:16:54 +02:00
Eugen Rochko 9bd5838646 [Glitch] Fix browser glitch caused by two overlapping scroll animations in web UI 
Port ef4d6ab988 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:16:28 +02:00
Eugen Rochko 80cb285819 [Glitch] Fix sass deprecation warning 
Port 29656cb9e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:14:54 +02:00
Renaud Chaput d77348f830 [Glitch] Fix the appearance of avatars when they do not load 
Port 8b70834035 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:13:57 +02:00
Christian Schmidt 0820cbcb35 [Glitch] Mute XHR abort errors 
Port 7740f1a6bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:13:23 +02:00
Claire 221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
github-actions[bot] b0f6d3e112
New Crowdin Translations (automated) (#2773) 
* 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-09-21 14:57:30 +02:00
Eugen Rochko e7fd0985c9
Change zoom icon in web UI (#29683) 2024-09-20 09:42:02 +00:00
github-actions[bot] 162f9a3c90
New Crowdin Translations (automated) (#31993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-20 08:31:28 +00:00
Renaud Chaput ae03e4ffc6
Update directory page options to use URL params (#31977) 2024-09-19 15:34:08 +00:00
Claire 57a38f071b
Fix custom `history.push` and `history.replace` building bogus location if path is omitted (#31980) 2024-09-19 14:58:33 +00:00
Eugen Rochko ef4d6ab988
Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
github-actions[bot] efdc17513d
New Crowdin Translations (automated) (#31974) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-19 10:34:19 +00:00
Matt Jankowski 5d573c976e
Remove unused E2EE-related methods (#31964) 2024-09-19 10:23:58 +00:00
Eugen Rochko 29656cb9e0
Fix sass deprecation warning (#31961) 2024-09-18 17:39:32 +00:00
Renaud Chaput 8b70834035
Fix the appearance of avatars when they do not load (#31966) 2024-09-18 17:39:15 +00:00
Christian Schmidt 7740f1a6bb
Mute XHR abort errors (#31952) 2024-09-18 08:43:24 +00:00
github-actions[bot] bd86c692cf
New Crowdin Translations (automated) (#31959) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-18 08:06:44 +00:00
Claire 6bd86fede0 [Glitch] Increase no-gap-breakpoint by 32px to fix overflow 
Port d2f9075078 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-17 18:13:36 +02:00
Michael Stanclift a85b2476c2 [Glitch] Fix background of text detection progress 
Port 5a33a5658b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-17 18:13:36 +02:00
Claire 93b2c8164e [Glitch] Fix selectSettingsNotificationsExcludedTypes not being memoized properly 
Port ca8e892c1a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-17 18:13:36 +02:00
Claire 11de3dbef6 [Glitch] Enable grouped notifications unconditionally 
Port c620452fd7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-17 18:13:36 +02:00
Claire 6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
David Roetzel d8f9db547a
Merge commit from fork 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-09-17 16:59:29 +02:00
github-actions[bot] 6a233cbfcf
New Crowdin Translations (automated) (#31946) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-17 13:02:53 +00:00
Claire d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow (#31889) 2024-09-17 03:19:42 +00:00
Michael Stanclift 5a33a5658b
Fix background of text detection progress (#31943) 2024-09-17 03:19:04 +00:00
Claire 18209d2011
Merge pull request #2847 from ClearlyClaire/glitch-soc/fixes/click-detailed-status 
Fix detailed statuses being clickable and linking to broken pages
 2024-09-16 23:51:37 +02:00
Claire 43f6792e1b Fix detailed statuses being clickable and linking to broken pages 2024-09-16 22:51:19 +02:00
Claire 0740352ce6 [Glitch] Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` 
Port e0648a916a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-16 21:28:05 +02:00
Eugen Rochko b6398cf2d3 [Glitch] Fix horizontal scrollbar on who to follow carousel in web UI 
Port efb0e2c34b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-16 21:28:05 +02:00
Claire e25634ccef [Glitch] Convert notification requests actions and reducers to Typescript 
Port c0eda832f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-16 21:28:05 +02:00
Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Claire ca8e892c1a
Fix selectSettingsNotificationsExcludedTypes not being memoized properly (#31881) 2024-09-16 14:51:56 +00:00
Claire 6c76a7a907
Fix cancel follow request button sometimes saying “Follow back” (#31934) 2024-09-16 13:20:44 +00:00
Claire c620452fd7
Enable grouped notifications unconditionally (#31929) 2024-09-16 13:12:10 +00:00
Claire e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` (#31840) 2024-09-16 12:10:02 +00:00
Eugen Rochko efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI (#31912) 2024-09-16 12:08:37 +00:00
Claire c0eda832f3
Convert notification requests actions and reducers to Typescript (#31866) 2024-09-16 09:54:03 +00:00
github-actions[bot] 474abf3c7f
New Crowdin Translations (automated) (#31911) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-16 08:48:20 +00:00
Claire 117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
github-actions[bot] 353ade767b
New Crowdin Translations (automated) (#31898) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-13 08:41:46 +00:00
Claire 427ed60274 Fix link handling within detailed status contents 2024-09-12 22:42:07 +02:00
Claire 4050beb6e2 Fix detailed status timestamp link target not being the original URL 2024-09-12 22:30:40 +02:00
Michael Stanclift 9b1ecf7aee [Glitch] Fix review history and action modal styling 
Port a269ff9253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 21:38:15 +02:00
Claire afd3953cdd [Glitch] Autofocus primary button in modals 
Port 5f782f9629 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 21:35:03 +02:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Eugen Rochko bd68d2ab21 [Glitch] Change design of embed modal in web UI 
Port 24ef8255b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 20:58:23 +02:00
Eugen Rochko e705ec13db [Glitch] Change embedded posts to use web UI 
Port 3d46f47817 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 20:58:02 +02:00
Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
 2024-09-12 20:05:08 +02:00