tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,134 Commits 5 Branches 0 Tags
85e6efd351ca7882cb6416fc63a287cd6ddd2077
Commit Graph
3797 Commits
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
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]andGitHub Actions 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
github-actions[bot]andGitHub Actions 61722b1b1f New Crowdin Translations (automated) (#30808) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-24 10:46:53 +00:00
Claire 6300273664 Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream 2024-06-21 12:02:42 +02:00
github-actions[bot]andGitHub Actions 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
Claire fd867adffe Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +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
github-actions[bot]andGitHub Actions a0910cd49c New Crowdin Translations (automated) (#30772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-20 09:03:28 +00:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
Renaud Chaput d558dfd77d Convert notifications policies frontend code to Typescript (#29868) 2024-06-18 13:23:30 +00:00
github-actions[bot]andGitHub Actions 50db95b9a1 New Crowdin Translations (automated) (#30746) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-18 12:39:36 +00: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
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
github-actions[bot]andGitHub Actions 35d52d7914 New Crowdin Translations (automated) (#30723) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-17 12:13:23 +00:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Eugen Rochko b9fd7571ae Change sidebar text in web UI (#30696) 2024-06-14 13:04:20 +00:00
github-actions[bot]andGitHub Actions a7264a2b42 New Crowdin Translations (automated) (#30704) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-14 09:08:17 +00:00
Marcin Mikołajczak a243963e93 LanguageDropdown: remove unused function (#30346) 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-06-13 19:46:45 +00:00
github-actions[bot]andGitHub Actions dd587d29b6 New Crowdin Translations (automated) (#30684) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-13 13:30:07 +00:00
Eugen Rochko ed6d24330b Add author links on the explore page in web UI (#30521) 2024-06-13 13:04:16 +00:00
github-actions[bot]andGitHub Actions ced463360e New Crowdin Translations (automated) (#30666) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-12 10:48:31 +00:00
Claire 4daed855e5 Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
github-actions[bot]andGitHub Actions 0dabda9bee New Crowdin Translations (automated) (#30646) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-11 07:14:52 +00:00
Claire be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
github-actions[bot]andGitHub Actions bb27321781 New Crowdin Translations (automated) (#30608) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-10 14:29:30 +00:00
Claire 7277d2f130 Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream 2024-06-07 20:30:51 +02:00
github-actions[bot]andGitHub Actions c1b0c1a5e4 New Crowdin Translations (automated) (#30586) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-07 09:59:30 +00:00
Claire 30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
github-actions[bot]andGitHub Actions a729104a41 New Crowdin Translations (automated) (#30575) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-06 08:53:28 +00:00
Eugen Rochko 3c435f9ba0 Change counters to be displayed on profile timelines in web UI (#30525) 2024-06-05 23:52:46 +00:00
github-actions[bot]andGitHub Actions e4e3875452 New Crowdin Translations (automated) (#30543) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-05 07:52:25 +00:00
github-actions[bot]andGitHub Actions aa9b80f57d New Crowdin Translations (automated) (#30517) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-03 07:34:33 +00:00
github-actions[bot]andGitHub Actions dac4eba46b New Crowdin Translations (automated) (#30499) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-31 09:26:52 +00:00
github-actions[bot]andGitHub Actions a0b525e50b New Crowdin Translations (automated) (#30477) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-30 14:54:51 +00:00
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
github-actions[bot]andGitHub Actions 6eea83211c New Crowdin Translations (automated) (#30464) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-29 11:12:23 +00:00
Eugen Rochko 128987eded Add support for fediverse:creator OpenGraph tag (#30398) 2024-05-29 01:34:33 +02:00
github-actions[bot]andGitHub Actions e5c3dc33a2 New Crowdin Translations (automated) (#30421) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-27 09:35:45 +00:00
Renaud Chaput 3750e8050c Enable stricter Typescript options (#30435) 2024-05-27 09:24:59 +00:00
Renaud Chaput 6a75e1c8c8 Fix createDataLoadingThunk to allow actions without arguments (#30439) 2024-05-27 09:00:40 +00:00
Claire d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
github-actions[bot]andGitHub Actions 54351d01f2 New Crowdin Translations (automated) (#30410) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-24 08:26:38 +00:00
Renaud Chaput 8ea2726376 Fix a leftover argument to api() (#30405) 2024-05-24 08:25:42 +00:00