Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b510dc2da 
								
							 
						 
						
							
							
								
								upd: add deleteThisAccountConfirm  
							
							
							
						 
						
							2025-04-06 00:16:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d27e5ce3e 
								
							 
						 
						
							
							
								
								fix: bubble timeline not being selectable when logged out  
							
							
							
						 
						
							2025-03-25 22:40:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								aa1691295b 
								
							 
						 
						
							
							
								
								merge: Make confirm follow prompt not show up when cancelling a follow request ( !941 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/941 
Closes  #822 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 
						
							2025-03-21 16:46:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								a35c2f214b 
								
							 
						 
						
							
							
								
								convert Authorized Fetch to a setting and add support for hybrid mode (essential metadata only)  
							
							
							
						 
						
							2025-03-16 10:07:57 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								d0a074ac89 
								
							 
						 
						
							
							
								
								fetch linked notes manually, unless we have them in DB - fixes 1006  
							
							
							
						 
						
							2025-03-15 19:17:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								91e15fafbf 
								
							 
						 
						
							
							
								
								upd: confirm dialog for undoing follow request  
							
							
							
						 
						
							2025-03-08 11:54:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								daa449152d 
								
							 
						 
						
							
							
								
								upd: allow users to remove avatars  
							
							
							
						 
						
							2025-03-05 19:48:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								5d1e1a2215 
								
							 
						 
						
							
							
								
								fix typo in "cannotLoadPage" translation  
							
							
							
						 
						
							2025-03-02 13:38:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								e5b8fc3c80 
								
							 
						 
						
							
							
								
								add missing modlog render blocks  
							
							
							
						 
						
							2025-03-02 13:38:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								20e2a6e95a 
								
							 
						 
						
							
							
								
								add SkFetchNote to render a note by ID  
							
							
							
						 
						
							2025-03-02 13:38:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								27d43879a2 
								
							 
						 
						
							
							
								
								add moderation logs for many endpoints  
							
							... 
							
							
							
							- `/admin/delete-all-files-of-a-user`
- `/admin/nsfw-user`
- `/admin/unnsfw-user`
- `/admin/silence-user`
- `/admin/unsilence-user`
- `/admin/accounts/create`
- `/admin/drive/clean-remote-files`
- `/admin/drive/cleanup`
- `/admin/emoji/set-category-bulk`
- `/admin/emoji/set-license-bulk`
- `/admin/emoji/set-aliases-bulk`
- `/admin/emoji/add-aliases-bulk`
- `/admin/emoji/remove-aliases-bulk`
- `/admin/emoji/import-zip`
- `/admin/federation/delete-all-files`
- `/admin/federation/remove-all-following`
- `/admin/promo/create`
- `/admin/relay/add`
- `/admin/relay/remove` 
							
						 
						
							2025-03-02 13:38:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								365a0bd2c5 
								
							 
						 
						
							
							
								
								improve labels and wording for reject quotes feature  
							
							
							
						 
						
							2025-02-20 09:58:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								292d3b9229 
								
							 
						 
						
							
							
								
								add "reject quotes" toggle at user and instance level  
							
							... 
							
							
							
							+ improve, cleanup, and de-duplicate quote resolution
+ add warning message when quote cannot be loaded
+ add "process error" framework to display warnings when a note cannot be correctly loaded from another instance 
							
						 
						
							2025-02-20 09:57:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								c32bde739e 
								
							 
						 
						
							
							
								
								add translation entry for "write:admin:cw-user"  
							
							
							
						 
						
							2025-02-16 19:20:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								568d82a974 
								
							 
						 
						
							
							
								
								record ModLog entry when setting a user's content warning  
							
							
							
						 
						
							2025-02-16 19:20:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								4f79f85703 
								
							 
						 
						
							
							
								
								fix TypeScript errors in modlog.MogLog.vue  
							
							
							
						 
						
							2025-02-16 19:20:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								ea89348b62 
								
							 
						 
						
							
							
								
								add user-level "force content warning" moderation feature  
							
							
							
						 
						
							2025-02-16 19:20:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								667262dcfb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/SearchService.ts
#	packages/frontend/src/pages/search.note.vue
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-13 17:04:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								ed981a6970 
								
							 
						 
						
							
							
								
								add new note search file types (module, flash) and optimize file type query  
							
							
							
						 
						
							2025-02-13 09:28:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								feb80ee992 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							
							
						 
						
							2025-02-11 10:52:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								363111f5de 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-10 23:34:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								58ad9b13ab 
								
							 
						 
						
							
							
								
								merge: add missing translations for admin perms -  fixes   #918  ( !893 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/893 
Closes  #918 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-10 16:18:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								43d4835c2f 
								
							 
						 
						
							
							
								
								add missing translations for admin perms -  fixes   #918  
							
							
							
						 
						
							2025-02-10 10:48:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								83afdc883a 
								
							 
						 
						
							
							
								
								clearer warning when replacing saved keys  
							
							
							
						 
						
							2025-02-07 18:46:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								f36029f795 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-07 11:57:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c889948f95 
								
							 
						 
						
							
							
								
								feat: Add generation of keys to admin page  
							
							
							
						 
						
							2025-02-07 06:00:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								708debf5d5 
								
							 
						 
						
							
							
								
								Merge tag '2025.2.0' into merge/2024-02-03  
							
							
							
						 
						
							2025-02-06 10:22:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								889804b2a8 
								
							 
						 
						
							
							
								
								add settings UI to configure defaultCW and defaultCWPriority  
							
							
							
						 
						
							2025-02-05 14:22:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								74407bc8ee 
								
							 
						 
						
							
							
								
								add MiUserProfile.defaultCW property and API  
							
							
							
						 
						
							2025-02-05 14:22:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								7b964799d8 
								
							 
						 
						
							
							
								
								regenerate locales index  
							
							
							
						 
						
							2025-02-04 20:39:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fbc6d0de54 
								
							 
						 
						
							
							
								
								enhance: ページslugに使用可能な文字を限定 ( #15395 )  
							
							... 
							
							
							
							* wip
* paramの正規表現で弾くように
* apiWithDialogを使用するように
* Update CHANGELOG.md
---------
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> 
							
						 
						
							2025-02-05 01:39:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kinetix 
								
							 
						 
						
							
							
							
							
								
							
							
								993532bc1f 
								
							 
						 
						
							
							
								
								Adding robots.txt override via admin control panel  
							
							... 
							
							
							
							This is a requested low priority feature in #418  - I created the changes
to follow similarly to how the Instance Description is handled. 
							
						 
						
							2025-01-28 15:57:45 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								297186e492 
								
							 
						 
						
							
							
								
								enhance(frontend): 絵文字管理画面β(ローカル)のUI・UX改善 ( #15349 )  
							
							... 
							
							
							
							* enhance(frontend): 絵文字管理画面β(ローカル)のUI・UX改善
* fix
* 🎨 
* 表示件数をメニューから変更するように
* 確認ダイアログ
* fix i18n
* needWideArea: trueならwidgetの開閉ボタンを表示しないように
* fix: 検索ウィンドウは一つしか開けないように 
							
						 
						
							2025-01-26 11:10:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									おさむのひと 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4bca4708e 
								
							 
						 
						
							
							
								
								feat(frontend): リモート絵文字のインポート時に詳細を確認できるように ( #15344 )  
							
							... 
							
							
							
							* feat(frontend): リモート絵文字のインポート時に詳細を確認できるように
* 追加対応
* MkInput -> MkKeyValue 
							
						 
						
							2025-01-26 05:59:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									おさむのひと 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f9ad127aaf 
								
							 
						 
						
							
							
								
								feat: 新カスタム絵文字管理画面(β)の追加 ( #13473 )  
							
							... 
							
							
							
							* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* fix
* fix
* fix
* fix size
* fix register logs
* fix img autosize
* fix row selection
* support delete
* fix border rendering
* fix display:none
* tweak comments
* support choose pc file and drive file
* support directory drag-drop
* fix
* fix comment
* support context menu on data area
* fix autogen
* wip イベント整理
* イベントの整理
* refactor grid
* fix cell re-render bugs
* fix row remove
* fix comment
* fix validation
* fix utils
* list maximum
* add mimetype check
* fix
* fix number cell focus
* fix over 100 file drop
* remove log
* fix patchData
* fix performance
* fix
* support update and delete
* support remote import
* fix layout
* heightやめる
* fix performance
* add list v2 endpoint
* support pagination
* fix api call
* fix no clickable input text
* fix limit
* fix paging
* fix
* fix
* support search
* tweak logs
* tweak cell selection
* fix range select
* block delete
* add comment
* fix
* support import log
* fix dialog
* refactor
* add confirm dialog
* fix name
* fix autogen
* wip
* support image change and highlight row
* add columns
* wip
* support sort
* add role name
* add index to emoji
* refine context menu setting
* support role select
* remove unused buttons
* fix url
* fix MkRoleSelectDialog.vue
* add route
* refine remote page
* enter key search
* fix paste bugs
* fix copy/paste
* fix keyEvent
* fix copy/paste and delete
* fix comment
* fix MkRoleSelectDialog.vue and storybook scenario
* fix MkRoleSelectDialog.vue and storybook scenario
* add MkGrid.stories.impl.ts
* fix
* [wip] add custom-emojis-manager2.stories.impl.ts
* [wip] add custom-emojis-manager2.stories.impl.ts
* wip
* 課題はまだ残っているが、ひとまず完了
* fix validation and register roles
* fix upload
* optimize import
* patch from dev
* i18n
* revert excess fixes
* separate sort order component
* add SPDX
* revert excess fixes
* fix pre test
* fix bugs
* add type column
* fix types
* fix CHANGELOG.md
* fix lit
* lint
* tweak style
* refactor
* fix ci
* autogen
* Update types.ts
* CSS Module化
* fix log
* 縦スクロールを無効化
* MkStickyContainer化
* regenerate locales index.d.ts
* fix
* fix
* テスト
* ランダム値によるUI変更の抑制
* テスト
* tableタグやめる
* fix last-child css
* fix overflow css
* fix endpoint.ts
* tweak css
* 最新への追従とレイアウト微調整
* ソートキーの指定方法を他と合わせた
* fix focus
* fix layout
* v2エンドポイントのルールに対応
* 表示条件などを微調整
* fix MkDataCell.vue
* fix error code
* fix error
* add comment to MkModal.vue
* Update index.d.ts
* fix CHANGELOG.md
* fix color theme
* fix CHANGELOG.md
* fix CHANGELOG.md
* fix center
* fix: テーブルにフォーカスがあり、通常状態であるときはキーイベントの伝搬を止める
* fix: ロール選択用のダイアログにてコンディショナルロールを×ボタンで除外できなかったのを修正
* fix remote list folder
* sticky footers
* chore: fix ci error(just single line-break diff)
* fix loading
* fix like
* comma to space
* fix ci
* fix ci
* removed align-center
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com> 
							
						 
						
							2025-01-20 11:35:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								60c937606b 
								
							 
						 
						
							
							
								
								merge: enhance: Open boost visibility menu on shift-click ( !859 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/859 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-01-18 17:28:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								9fe0eb5e49 
								
							 
						 
						
							
							
								
								merge: show the border MFM function in cheatsheet -  fixes   #533  ( !862 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/862 
Closes  #533 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-01-18 16:45:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								804cd93f81 
								
							 
						 
						
							
							
								
								clearer ListenBrainz label -  fixes   #589  
							
							
							
						 
						
							2025-01-18 11:50:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								49d6fc6782 
								
							 
						 
						
							
							
								
								show the border MFM function in cheatsheet -  fixes   #533  
							
							
							
						 
						
							2025-01-18 11:05:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HellhoundSoftware 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c90eebe86 
								
							 
						 
						
							
							
								
								Add tooltip for shift-boost  
							
							
							
						 
						
							2025-01-15 14:38:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								66532333cd 
								
							 
						 
						
							
							
								
								fix(frontend): localeの型を生成 ( #15285 )  
							
							
							
						 
						
							2025-01-15 11:34:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									taichan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9760f3d7c9 
								
							 
						 
						
							
							
								
								enhance(frontend): ワードミュートで引っかかったワードを表示可能にする ( #15195 )  
							
							... 
							
							
							
							* feat(frontend): ソフトミュートで引っかかったものを表示できるように
* ソフトワードミュートのミュート文字列表示を切り替え可能に
* Chore(docs): Update CHANGELOG
* Fix: language file
* Fixed by review
* Fix by review
* Fix: reloadAskなおしきれていなかった
* perf: filter -> findに変更して最初の一個のみを表示するように変更
* Revert "perf: filter -> findに変更して最初の一個のみを表示するように変更"
This reverts commit 72ef92f0d62828754702cd00e26ad873adb4652f. 
							
						 
						
							2025-01-14 13:49:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5445b023e5 
								
							 
						 
						
							
							
								
								enhance: 連合モードにあわせてフロントエンドを変化させるように ( #15112 )  
							
							... 
							
							
							
							* enhance(backend): metaにfederation modeに関する情報を公開
* enhance(frontend): 登録画面の注意書きを追加
* enhance(frontend): aboutページ・サーバー情報
* enhance(frontend): サーバー統計
* enhance(frontend): みつけるページ
* enhance(frontend): 検索
* enhance(frontend): ユーザー選択
* enhance(frontend): 設定画面
* enhance(frontend): ウィジェット
* enhance(frontend): リモートで開くオプション
* Update Changelog
* enhance(frontend): ステータスバー
* i18n
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> 
							
						 
						
							2025-01-14 11:08:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									おさむのひと 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64501c69a1 
								
							 
						 
						
							
							
								
								feat(frontend): Botプロテクションの設定変更時は実際に検証を通過しないと保存できないようにする ( #15151 )  
							
							... 
							
							
							
							* feat(frontend): CAPTCHAの設定変更時は実際に検証を通過しないと保存できないようにする
* なしでも保存できるようにした
* fix CHANGELOG.md
* フォームが増殖するのを修正
* add comment
* add server-side verify
* fix ci
* fix
* fix
* fix i18n
* add current.ts
* fix text
* fix
* regenerate locales
* fix MkFormFooter.vue
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> 
							
						 
						
							2025-01-14 10:57:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6649e58b56 
								
							 
						 
						
							
							
								
								enhance(frontend): ワードミュート・ハードワードミュートの説明を追加 ( #15207 )  
							
							
							
						 
						
							2025-01-04 05:40:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f123be38b9 
								
							 
						 
						
							
							
								
								enhance(frontend): 照会の際にエラーを表示するように ( #15147 )  
							
							... 
							
							
							
							* enhance: 照会の失敗理由を表示するように
* Update Changelog
* fix
* fix test
* lookupErrors-> remoteLookupErrors 
							
						 
						
							2024-12-19 16:05:33 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								d31db31c07 
								
							 
						 
						
							
							
								
								add translations for notification settings  
							
							
							
						 
						
							2024-12-17 13:21:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								e2352839e4 
								
							 
						 
						
							
							
								
								merge: upstream changes for 2024.11 ( !742 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/742 
Closes  #645  and #646 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-12-15 17:27:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dddfdf8a13 
								
							 
						 
						
							
							
								
								Add locales and new navbar entry  
							
							
							
						 
						
							2024-12-12 21:45:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								b266a5f9f6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.10  
							
							
							
						 
						
							2024-12-12 17:38:29 +00:00