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

13283 Commits (85e6efd351ca7882cb6416fc63a287cd6ddd2077)

Author SHA1 Message Date
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
Emelia Smith 30ae5952d2
Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812) 2024-06-25 07:46:53 +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
Claire 21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
Claire 8827cd597e
Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments (#30819) 2024-06-24 13:11:10 +00:00
github-actions[bot] 61722b1b1f
New Crowdin Translations (automated) (#30808) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-24 10:46:53 +00:00
Claire 3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
Matt Jankowski 929b9fdaff
Remove exclusion for `Rails/LexicallyScopedActionFilter` cop (#30697) 2024-06-21 15:34:13 +00:00
Matt Jankowski 348ccf206e
Fix `Style/ClassEqualityComparison` cop (#30058) 2024-06-21 15:33:55 +00:00
Matt Jankowski 72484a194f
Remove `CacheBuster` default options (#30718) 2024-06-21 15:32:49 +00:00
David Roetzel 2cab1c7b09
Improve encoding detection for link cards (#30780) 2024-06-21 12:51:10 +00:00
Renaud Chaput 2f994bb34a [Glitch] Fix error when deleting a status 
Port 7d12522ed7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-21 12:03:35 +02:00
Claire 6300273664 Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream 2024-06-21 12:02:42 +02:00
github-actions[bot] 9e932fa1dd
New Crowdin Translations (automated) (#30789) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-21 09:14:44 +00:00
Renaud Chaput 7d12522ed7
Fix error when deleting a status (#30784) 2024-06-20 22:39:06 +00:00
Renaud Chaput 8ae61fdee5 [Glitch] Convert `disconnectTimeline` and `timelineDelete` actions to Typescript 
Port 1c65932776 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-20 19:22:24 +02:00
Claire fd867adffe Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +02:00
Claire bb2d77b4a0
Change `/api/v2_alpha/notifications` to only return historical data in pages (#30781) 2024-06-20 15:54:50 +00:00
Claire f723370c69
Fix missing `account_warning` delegation in `NotificationGroup` (#30779) 2024-06-20 13:44:49 +00:00
Renaud Chaput c97e798d8c [Glitch] Improve `createdataLoadingThunk` 
Port 27529247b2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-20 13:57:58 +02:00
Claire 04e57efa55 Merge commit '27529247b289a0e78d2deb97626ddb60baf04d86' into glitch-soc/merge-upstream 2024-06-20 13:57:08 +02:00
Renaud Chaput 1c65932776
Convert `disconnectTimeline` and `timelineDelete` actions to Typescript (#30777) 2024-06-20 11:56:52 +00:00
Renaud Chaput 27529247b2
Improve `createdataLoadingThunk` (#30778) 2024-06-20 11:42:10 +00:00
Claire 7889e983fb
Add `group_key` attribute to `NotificationSerializer` (#30776) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-20 11:05:25 +00:00
github-actions[bot] a0910cd49c
New Crowdin Translations (automated) (#30772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-20 09:03:28 +00:00
Claire 52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
Matt Jankowski a8b3d2e4e4
Consolidate time periods methods into base measure (#30757) 2024-06-19 08:45:47 +00:00
Renaud Chaput af0a1a8774 [Glitch] Convert notifications policies frontend code to Typescript 
Port d558dfd77d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-18 18:22:40 +02:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
Claire 58ace2e45e
Fix SQL error in admin measures API (#30753) 2024-06-18 16:04:58 +00:00
Renaud Chaput d558dfd77d
Convert notifications policies frontend code to Typescript (#29868) 2024-06-18 13:23:30 +00:00
github-actions[bot] 50db95b9a1
New Crowdin Translations (automated) (#30746) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-18 12:39:36 +00:00
Matt Jankowski 38c6825eda
Remove unused `Extractor#extract_cashtags_with_indices` method (#30742) 2024-06-18 12:16:16 +00:00
Eugen Rochko eccec92496 [Glitch] Change sidebar text in web UI 
Port b9fd7571ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 18:35:10 +02: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
Marcin Mikołajczak f0dba9af6f [Glitch] LanguageDropdown: remove unused function 
Port a243963e93 to glitch-soc

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 18:22:00 +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
Michael Stanclift d5f02adad7
Add option to use native Ruby driver for Redis (#30717) 2024-06-17 12:28:01 +00:00
Matt Jankowski d7b7617321
Use `class_names` in admin/account_moderation_notes helper (#30719) 2024-06-17 12:20:57 +00:00
github-actions[bot] 35d52d7914
New Crowdin Translations (automated) (#30723) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-17 12:13:23 +00:00
Eugen Rochko fd3697723c [Glitch] Add author links on the explore page in web UI 
Port ed6d24330b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 14:08:08 +02:00
Eugen Rochko 454dc407f4 [Glitch] Fix a few visual glitches with link previews in web UI 
Port 9984243467 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 13:56:23 +02:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Renaud Chaput 43bbdea421
Fix invalid `mask-icon` when a custom instance icon is configured (#30734) 2024-06-17 09:00:26 +00:00
Michael Stanclift a777f7e3cc
Restore short Ruby version on admin dashboard (#30711) 2024-06-14 16:10:16 +00:00
Michael Stanclift 4a5442edaa
Add ffmpeg and ImageMagick versions to admin dashboard (#30710) 2024-06-14 15:36:57 +00:00