3844 commits

Author	SHA1	Message	Date
Mar0xy	d521e95dda	fix: checks	2023-09-25 19:50:22 +02:00
Mar0xy	354937abdd	upd: actually use body	2023-09-25 19:49:30 +02:00
Mar0xy	314122f509	upd: convert masto ids to sharkeyid on media	2023-09-25 19:48:43 +02:00
Mar0xy	817203a9e1	fix: fileid min length issue	2023-09-25 19:43:59 +02:00
Mar0xy	f1c827b815	add: edit support on masto api	2023-09-25 19:33:55 +02:00
Mar0xy	0d013ff54f	upd: move media put endpoint into main api file	2023-09-25 19:15:55 +02:00
Mar0xy	324cc5509e	fix: adding description not working on media	2023-09-25 18:46:17 +02:00
Mar0xy	2bda4f1768	test: enable error logs for media	2023-09-25 18:35:52 +02:00
Mar0xy	f336eec494	upd: add baseurl to all related calls	2023-09-25 16:54:05 +02:00
Mar0xy	b9752b20cb	upd: fetch header on normal user call	2023-09-25 16:46:02 +02:00
Mar0xy	4abdf6f7a6	fix: some timelines not getting proper host	2023-09-25 16:42:21 +02:00
Mar0xy	607a3e7427	fix: return empty emoji list for polls for masto app	2023-09-25 16:08:31 +02:00
Mar0xy	dd72610daa	fix: resolve host properly	2023-09-25 16:01:19 +02:00
Mar0xy	b0b96f00b9	upd: on no quote return false instead of null	2023-09-25 15:57:50 +02:00
Mar0xy	205881bfa9	upd: change the way quote gets handled	2023-09-25 15:55:38 +02:00
Mar0xy	b2d367faed	fix: favourites on megalodon	2023-09-25 15:38:30 +02:00
Mar0xy	84fcf9efc7	upd: change way of fetching descendants	2023-09-25 13:30:36 +02:00
Mar0xy	73b086b6b8	upd: fetch ancestors	2023-09-25 13:29:43 +02:00
Mar0xy	219b45a3c0	fix: new lines in description not being translated	2023-09-25 13:15:09 +02:00
Mar0xy	2ea6e0a579	fix: resolve host variable on userDetail	2023-09-25 13:06:07 +02:00
Mar0xy	15c43372f9	fix: acct issues on megalodon	2023-09-25 13:04:16 +02:00
Mar0xy	d3832f2560	upd: return @ before username	2023-09-25 12:51:38 +02:00
Mar0xy	5cca3e81d2	chore: wrong value	2023-09-25 12:49:39 +02:00
Mar0xy	49077bad34	fix: getfeatureduser	2023-09-25 12:48:37 +02:00
Mar0xy	0547940523	chore: use this.baseUrl instead of BASE_URL	2023-09-25 12:46:47 +02:00
Mar0xy	aaa3a34d60	chore: swap base_url getting on some endpoints	2023-09-25 12:37:58 +02:00
Marie	4c89e433ad	chore: return proper software name in nodeinfo	2023-09-25 12:24:15 +02:00
Mar0xy	f15b7fb250	fix: fetching remote users on elk via megalodon	2023-09-25 12:21:10 +02:00
Mar0xy	151fcb2d5c	chore: change manifest misskey to sharkey	2023-09-25 12:17:11 +02:00
syuilo	bd19d75c9c	enhance: improve moderation log	2023-09-25 16:03:43 +09:00
Mar0xy	30527edf51	revert: userentity description location	2023-09-25 06:05:32 +02:00
Mar0xy	ecdf56d1ad	revert: description fetching	2023-09-25 06:04:23 +02:00
Mar0xy	86556f7913	fix: wrong section	2023-09-25 05:57:53 +02:00
Mar0xy	2b24550ce2	fix: typecheck	2023-09-25 05:50:47 +02:00
Mar0xy	550d154f19	chore: fix multiple spaces	2023-09-25 05:48:22 +02:00
Mar0xy	353d144dfa	fix: u.description	2023-09-25 05:46:04 +02:00
Mar0xy	8557a8e588	test: elk.zone callback	2023-09-25 05:37:41 +02:00
Mar0xy	06630c097b	upd: update user data fetching on masto api	2023-09-25 05:33:25 +02:00
Mar0xy	c10f785614	upd: get alt and blurhash on media	2023-09-25 05:22:45 +02:00
Mar0xy	62b2c31655	upd: return empty list on empty custom emoji	2023-09-25 05:16:13 +02:00
Mar0xy	5aa2b197da	chore: lint	2023-09-25 05:01:50 +02:00
Mar0xy	c2d1564851	upd: return empty tags on featured_tags call	2023-09-25 04:57:32 +02:00
Mar0xy	871407ce53	upd: add new endpoint to mk api, add preferences to masto api	2023-09-25 04:55:11 +02:00
Mar0xy	035d600406	chore: remove createdAt in favour of created_at	2023-09-25 04:30:15 +02:00
Mar0xy	6ed28c76fb	upd: set createdAt on created_at	2023-09-25 04:22:17 +02:00
Mar0xy	fc377980d4	upd: dont require detail for createdAt	2023-09-25 04:16:07 +02:00
Mar0xy	0f8da74dc5	upd: try fetching from db	2023-09-25 04:07:31 +02:00
Mar0xy	16b81fb016	upd: add createdAt to user	2023-09-25 03:59:18 +02:00
Mar0xy	a7778e6425	fix: megalodon reblogged and favourited user info, add createdAt to note	2023-09-25 03:55:21 +02:00
Mar0xy	74213ba2b9	make favourited_by functional	2023-09-25 03:42:45 +02:00
syuilo	ece5469277	Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop	2023-09-25 10:34:10 +09:00
syuilo	576158e883	fix(backend): 「ユーザーの新規投稿」の通知設定を切り替えるとサーバー内部エラーが出る ... Fix #11892	2023-09-25 10:34:07 +09:00
zyoshoka	dcaea66dbf	fix(frontend): ログアウト状態でのノートメニュー内の詳細ボタンの表示をログイン状態と同じに (#11896) ... * fix(frontend): ログアウト状態でのノートの詳細ボタンの表示をログイン状態と同じに * Update CHANGELOG.md	2023-09-25 10:30:00 +09:00
syuilo	5318532a8d	enhance: improve moderation log	2023-09-25 10:29:12 +09:00
Mar0xy	1446514442	fix: contact person in masto instance endpoint	2023-09-25 03:26:05 +02:00
Mar0xy	3526880607	fix: get account statuses for local users	2023-09-25 03:23:03 +02:00
Mar0xy	97749e6722	upd: fix cross origin on file proxy	2023-09-25 02:58:40 +02:00
Mar0xy	485173c915	fix: user url	2023-09-25 02:56:43 +02:00
Mar0xy	645907851d	fix: text min length is 1 (thanks mk)	2023-09-25 02:48:05 +02:00
Mar0xy	df62b3786a	upd: apply host to alot of fields	2023-09-25 02:40:04 +02:00
Mar0xy	1b9897f83b	upd: replace star with heart	2023-09-25 02:04:28 +02:00
Mar0xy	806a76c5ca	fix: text is undefined in masto status api	2023-09-25 02:03:16 +02:00
Mar0xy	3fd2b55406	Revert "test: check old megalodon version" ... This reverts commit 89eea5df52.	2023-09-25 01:49:57 +02:00
Mar0xy	89eea5df52	test: check old megalodon version	2023-09-25 01:20:03 +02:00
Mar0xy	ead0667320	fix: upload media on masto api	2023-09-25 01:02:16 +02:00
Mar0xy	3e91abe3b3	upd: remove type for createdAt	2023-09-25 00:11:04 +02:00
Mar0xy	2847f9124e	upd: remove createdAt	2023-09-25 00:10:47 +02:00
Mar0xy	243527b2c8	fix: createdAt	2023-09-24 23:56:07 +02:00
Mar0xy	8f219557d4	upd: megalodon package fix lines, enable error on media	2023-09-24 23:46:02 +02:00
Mar0xy	60b2842203	chore: lint	2023-09-24 23:25:04 +02:00
Mar0xy	37d7a4b604	upd: change parser and fix fetchAccessToken	2023-09-24 23:18:39 +02:00
Mar0xy	30cc0a9b18	fix: oauth headers	2023-09-24 23:01:46 +02:00
Mar0xy	ce42cc0e8d	chore: remove ts-ignore comment	2023-09-24 22:57:05 +02:00
Mar0xy	8f997c39c9	chore: fix lint	2023-09-24 22:54:51 +02:00
Mar0xy	ad1d3ccb75	chore: change ignore to expect	2023-09-24 22:53:34 +02:00
Mar0xy	96180bb808	add: x-www-form-urlencoded parser	2023-09-24 22:50:59 +02:00
Mar0xy	4d3dee7022	upd: exclude elk from check	2023-09-24 22:23:26 +02:00
Mar0xy	fa30404048	upd: header	2023-09-24 22:13:20 +02:00
Mar0xy	95df69b06c	fix: backend issue	2023-09-24 22:07:41 +02:00
Mar0xy	0758e38237	upd: masto api support more types	2023-09-24 21:45:00 +02:00
Mar0xy	487e397810	upd: also split by +	2023-09-24 21:33:16 +02:00
Mar0xy	58988c2b3c	upd: change auth page	2023-09-24 20:44:33 +02:00
Mar0xy	c19ef16a06	chore: make lint happy	2023-09-24 19:53:56 +02:00
Mar0xy	c782085af4	upd: change oauth	2023-09-24 19:47:12 +02:00
Mar0xy	250beca901	fix oauth login	2023-09-24 19:15:08 +02:00
Amelia Yukii	018280e3df	Merge pull request #5 from transfem-org/feature/masto-api ... Feature/masto api	2023-09-24 17:48:55 +02:00
Mar0xy	2432a9a184	chore: typecheck fix	2023-09-24 17:45:49 +02:00
Mar0xy	b107ff5a1f	chore: lint says const happy	2023-09-24 17:42:31 +02:00
Mar0xy	c6c6873984	chore: change const to let	2023-09-24 17:38:31 +02:00
Mar0xy	db6dc1b52e	chore: lint and update package name	2023-09-24 17:36:13 +02:00
Mar0xy	410e6515d3	upd: complete status endpoint for masto	2023-09-24 17:10:33 +02:00
Mar0xy	54bb1efe8f	add: new emojiregex function	2023-09-24 16:26:27 +02:00
Mar0xy	7c3f3390b4	add: status get endpoints to masto api	2023-09-24 16:14:50 +02:00
Mar0xy	55e85fe1c1	upd: import status endpoint into service	2023-09-24 15:42:09 +02:00
Mar0xy	7640985332	add: status to masto endpoints	2023-09-24 15:41:38 +02:00
Mar0xy	f1fc1ba4c7	add: timeline endpoints tio masto api	2023-09-24 15:33:13 +02:00
Mar0xy	846f2d3877	upd: megalodon changes	2023-09-24 15:15:54 +02:00
Mar0xy	c85857f242	upd: update misskey support in megalodon	2023-09-24 14:44:55 +02:00
taichan	dc8ab01168	fix(backend): お知らせのページネーションが機能しない #11800 (#11890) ... * fix(backend): お知らせのページネーションが機能しない #11800 * Update CHANGELOG	2023-09-24 20:08:00 +09:00
Mar0xy	1501ab261d	upd: prettify layout	2023-09-24 12:05:59 +02:00
syuilo	fe570fe16b	Update DriveService.ts	2023-09-24 16:45:36 +09:00
syuilo	cf573add27	fix	2023-09-24 16:24:13 +09:00
syuilo	00659220a5	Update update.ts	2023-09-24 15:51:04 +09:00
syuilo	51546ad1ce	fix(backend): Playを非公開にできない ... Fix #11884	2023-09-24 15:46:14 +09:00
syuilo	841e6ff901	improve moderation log	2023-09-24 15:40:38 +09:00
syuilo	82a51d49a0	improve moderation log	2023-09-24 15:10:56 +09:00
FineArchs	30b231225c	Mk:apiで外部サーバーとの接続を禁止 (#11883) ... * Mk:url(): no automatic token attaching when ep is url * Limit requests to external servers by Mk:api * remove unused import * Update CHANGELOG.md * Update packages/frontend/src/scripts/aiscript/api.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>	2023-09-24 14:41:41 +09:00
Mar0xy	34e6717dab	add: filter endpoint to masto api	2023-09-24 05:35:50 +02:00
Mar0xy	4e375f303f	fix: remove host from vite	2023-09-24 05:11:48 +02:00
Mar0xy	168c041373	add: notification endpoints to masto api	2023-09-24 05:02:36 +02:00
Mar0xy	bb2d4b0e09	add: search endpoints to masto api	2023-09-24 04:25:01 +02:00
syuilo	d05563c448	tweak ui	2023-09-24 11:21:03 +09:00
Mar0xy	72ff1ffc9d	add: converter export from megalodon	2023-09-24 04:17:09 +02:00
syuilo	509cea511c	update deps	2023-09-24 11:09:49 +09:00
syuilo	72075314a8	🎨	2023-09-24 11:08:51 +09:00
syuilo	eb7c65ccb3	fix(frontend): アクセストークン発行の画面の権限が表示されない ... Fix #11880	2023-09-24 11:04:08 +09:00
syuilo	8e5a90589d	improve moderation log	2023-09-24 10:57:24 +09:00
syuilo	ed983a5baf	improve moderation log	2023-09-24 10:46:09 +09:00
syuilo	2ad3b1fd74	improve moderation log	2023-09-24 10:33:30 +09:00
Mar0xy	17efcf6b51	upd: Masto API accounts endpoint finished	2023-09-24 02:48:16 +02:00
Mar0xy	6c23c63b53	add: files back into megalodon	2023-09-24 01:47:45 +02:00
Mar0xy	afda15260f	upd: megalodon to v7	2023-09-24 01:44:53 +02:00
taichan	ed53b5f9bc	fix: ノート通知で絵文字が使われている名前が絵文字で表示されない #11877 (#11878)	2023-09-24 07:54:58 +09:00
Mar0xy	b4674ce65c	upd: add new endpoints to Masto API	2023-09-24 00:43:28 +02:00
Mar0xy	21015e7df6	add: account endpoint ... - Still work in progress	2023-09-24 00:42:59 +02:00
Mar0xy	763d7c3a63	add: timeline endpoint only with the functions for other endpoints	2023-09-24 00:42:03 +02:00
Mar0xy	b25e193845	upd: create auth endpoint	2023-09-24 00:41:13 +02:00
Mar0xy	4e401408e9	fix: megalodon not having checks for emojis	2023-09-24 00:39:55 +02:00
Mar0xy	9dfc4dbf02	fix: converter returning sharkeyid wrong	2023-09-24 00:39:33 +02:00
Insert5StarName	b9dbd442c1	shonk	2023-09-23 21:03:59 +02:00
Mar0xy	ceffd53d47	fix: spacing	2023-09-23 18:51:57 +02:00
Mar0xy	2375d043d1	add: Megalodon, initial mastodon api	2023-09-23 18:49:47 +02:00
syuilo	19bc9c20a6	improve moderation log	2023-09-23 20:50:02 +09:00
syuilo	76c4fedb7f	fix(frontend): 子メニューの表示位置がおかしい	2023-09-23 20:35:05 +09:00
syuilo	c3ccec723f	.js	2023-09-23 20:34:45 +09:00
syuilo	10924fd229	fix	2023-09-23 18:47:11 +09:00
syuilo	9e4d3ebe5f	enhance(backend): refine moderation log (#10939) ... * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update DriveService.ts	2023-09-23 18:28:16 +09:00
syuilo	ba6e85482e	コミット忘れ	2023-09-23 14:26:06 +09:00
Mar0xy	f86d5c883d	chore: change misskey to sharkey in setup	2023-09-23 06:11:28 +02:00
syuilo	5a4cf059ee	update deps	2023-09-23 12:46:19 +09:00
syuilo	d8a023063d	fix behavior of MkMenu.vue	2023-09-23 12:43:32 +09:00
syuilo	8f77350089	enhance: PWAのshort_nameを設定可能に	2023-09-23 12:38:20 +09:00
syuilo	063d24ad4f	🎨	2023-09-23 12:24:33 +09:00
Mar0xy	1e8d26ce4d	upd: change about-misskey to about-sharkey	2023-09-23 04:34:15 +02:00
Mar0xy	7149d0ffd9	chore: change positioning	2023-09-23 03:59:17 +02:00
Mar0xy	508650c41b	fix: make avatar clickable	2023-09-23 03:33:26 +02:00
syuilo	cac1c2f1e9	fix(backend): notes/reactionsのページネーションが機能しない	2023-09-23 10:00:38 +09:00
syuilo	ad8ddbf12f	🎨	2023-09-23 09:59:50 +09:00
Mar0xy	6a0aa612cc	fix: no such note	2023-09-23 02:50:54 +02:00
Mar0xy	d0956d5657	chore: resolve uri on UpdateNote call	2023-09-23 02:37:33 +02:00
Mar0xy	93ec6a62fb	upd: attempt at updating remote notes	2023-09-23 02:32:49 +02:00
かっこかり	1924bd20bb	enhance(frontend): プラグインのソースコードを確認・コピーできるように (#11873) ... * (add) plugin: view and copy source code * (fix) plugin permission ui * Update Changelog	2023-09-23 09:08:14 +09:00
Mar0xy	6cc2c2a20b	fix: tab css	2023-09-23 02:00:55 +02:00
Mar0xy	b672dff051	fix: element end missing	2023-09-23 01:47:57 +02:00
Mar0xy	9b31618215	fix: yolo sticky header	2023-09-23 01:44:30 +02:00
Mar0xy	9a22ba4bfe	upd: yolo the sticky	2023-09-23 01:40:00 +02:00
Mar0xy	7f0863a96e	fix: buttons opening post view	2023-09-23 01:26:57 +02:00
Mar0xy	fada5fe035	Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop	2023-09-23 00:54:16 +02:00
Insert5StarName	9c78524118	fix: fix reply button	2023-09-23 00:52:45 +02:00
Insert5StarName	0bed6ec08e	fix: actual fix for click	2023-09-23 00:49:23 +02:00
Insert5StarName	212c6a5e22	fix: buttons in posts	2023-09-23 00:37:33 +02:00
Mar0xy	c14a766b8e	chore: remove danger from edit	2023-09-23 00:16:01 +02:00
Mar0xy	d05848790c	fix: lint	2023-09-22 23:58:31 +02:00
Mar0xy	0da4717983	upd: clicky click on replies	2023-09-22 23:56:00 +02:00
Mar0xy	5d40ca6568	upd: update notes live on feed	2023-09-22 23:44:07 +02:00
Mar0xy	d869d7aa05	upd: View post on click	2023-09-22 23:35:09 +02:00
Mar0xy	8d2f655e51	fix: a few lint problems	2023-09-22 23:03:39 +02:00
Mar0xy	1795195097	fix: update? what update	2023-09-22 22:54:35 +02:00
Mar0xy	ab57616483	fix: AP Services throwing errors	2023-09-22 22:42:01 +02:00
Insert5StarName	d9eead6ccc	fix: remove commented code	2023-09-22 22:38:07 +02:00
Insert5StarName	dc77a90baf	fix: syntax and typo	2023-09-22 22:37:10 +02:00
Insert5StarName	dc10579950	upd: add support in frontend	2023-09-22 22:33:18 +02:00
Mar0xy	feec3c302b	upd: add backend for post editing	2023-09-22 21:05:42 +02:00
Mar0xy	deb8f73127	merge: develop branch ... commit 72f8f58fe8 Author: Insert5StarName <anime@shourai.de> Date: Fri Sep 22 20:37:36 2023 +0200 Partial Rebrand commit 918c80327c Author: Amelia Yukii <123300075+Insert5StarName@users.noreply.github.com> Date: Fri Sep 22 20:09:22 2023 +0200 Update FUNDING.yml commit b1d7aa5508 Author: Amelia Yukii <123300075+Insert5StarName@users.noreply.github.com> Date: Fri Sep 22 17:57:44 2023 +0200 Update README.md	2023-09-22 21:05:22 +02:00
Mar0xy	e6966ac9c8	upd: add switching between notes, notes with replies and notes with media on user page	2023-09-22 17:47:33 +02:00
Insert5StarName	7b79658dbd	fix: alt text indicator and sensetive button	2023-09-22 16:40:58 +02:00
syuilo	3085739e0e	🎨 ... Resolve #11867	2023-09-22 21:10:54 +09:00
syuilo	d2ae80dd21	fix(frontend): リアクション一覧が種別ごとにフィルタできない ... Fix #11865	2023-09-22 21:09:14 +09:00
anatawa12	526b3ae0e4	feat: ユーザを除外できるアンテナ (#11277) ... * feat: ユーザを除外できるアンテナ * feat(backend/api): ユーザを除外できるアンテナの作成・更新 * feat(frontend): ユーザを除外できるアンテナの作成・更新 * docs(changelog): add アンテナで一部のユーザを除外したすべてのノートから受信できるようになりました * fix: d.ts生成時にexport defaultを生成するように * fix CHANGELOG.md --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>	2023-09-22 16:52:43 +09:00
syuilo	90a5511a54	Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop	2023-09-22 16:47:45 +09:00
syuilo	032b6c6afb	update deps	2023-09-22 16:47:42 +09:00
typeling1578	3bbc2e55b1	fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正 (#11791) ... * fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正 * Revert "fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正" This reverts commit 9685715e6470caffc2b0c7b991d55c5edf7fa0f1. * fix ApResolverService * Update CHANGELOG.md * fix test --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>	2023-09-22 16:43:01 +09:00
かっこかり	7dc9fe4e24	feat(frontend): センシティブなメディアを目立たせる設定を追加 (#11851) ... * (add) highlight sensitive image * Update Changelog * (change) 設定の位置 * (add) apply mediaHighlight to video * (change) image -> media * Update CHANGELOG * やっぱもうちょっと太い方がいい * (fix) style * Update ja-JP.yml --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>	2023-09-22 16:03:10 +09:00
syuilo	c836157edb	enhance: 二要素認証設定時のセキュリティを強化 (#11863) ... * enhance: 二要素認証設定時のセキュリティを強化 パスワード入力が必要な操作を行う際、二要素認証が有効であれば確認コードの入力も必要にする * Update CoreModule.ts * Update 2fa.ts * wip * wip * Update 2fa.ts * tweak	2023-09-22 14:12:33 +09:00
Marie	81ebd25b1d	fix: duplicate id	2023-09-22 04:25:19 +02:00
Insert5StarName	909079d18d	Minor Modification	2023-09-22 04:20:38 +02:00
Marie	612dac29a9	upd: add transfem mi dark cherry to theme selector	2023-09-22 04:18:48 +02:00
Marie	496f919e8e	fix: element missing end	2023-09-22 04:13:13 +02:00
Insert5StarName	c69d9877e0	upd: add no alt text indicator	2023-09-22 04:07:20 +02:00
Mar0xy	77539573a9	upd: change default themes	2023-09-22 04:06:22 +02:00
Mar0xy	4a63114ef0	fix: lint	2023-09-22 03:57:24 +02:00
Amelia Yukii	313cbb19db	upd: port Listenbrainz ... upd: port Listenbrainz	2023-09-22 03:34:39 +02:00
Insert5StarName	113a67077e	upd: port Listenbrainz	2023-09-22 03:31:59 +02:00
syuilo	eca8c7a52f	tweak ui	2023-09-22 10:01:34 +09:00
Mar0xy	2bcd2eefc1	change to default functions for resolving collections	2023-09-22 02:46:41 +02:00
Mar0xy	2bfe51e39d	upd: fetch counts for notes, followers and following	2023-09-22 02:23:17 +02:00
Mar0xy	57c37a8938	upd: change menu sorting	2023-09-22 01:30:15 +02:00
Mar0xy	e5dc9f20ac	upd: remove github tag	2023-09-22 01:14:46 +02:00
Mar0xy	0b0947f7bf	upd: Add logout button	2023-09-22 01:12:29 +02:00
Mar0xy	b8a8e44905	Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop	2023-09-22 00:22:49 +02:00