bc1e274f45
Merge branch 'develop' into beta
2023-04-12 17:35:54 -07:00
b9e79cbc64
dev35
2023-04-12 17:34:51 -07:00
daf07089b4
chore: update mfm-js version ( #9844 )
...
This resolves #9757 .
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9844
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-13 00:33:53 +00:00
8f7c136f48
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-04-12 17:19:17 -07:00
7f9d3f9d54
chore: formatting
2023-04-12 17:19:14 -07:00
941b016998
Merge pull request 'feat: allow users to mute their own boosts' ( #9841 ) from naskya/calckey:allow-mute-my-boosts into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9841
2023-04-12 23:35:46 +00:00
498765f4f7
chore: up pnpm
2023-04-12 14:19:43 -07:00
e8566b95aa
correct position
2023-04-12 20:24:54 +09:00
46864916d9
Allow to mute my own boosts
2023-04-12 15:52:46 +09:00
fec0ed7966
Merge pull request 'Hyperlink more remote commits' ( #9839 ) from naskya/calckey:calckey-md into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9839
2023-04-11 19:57:51 +00:00
de7064ab79
Hyperlink more remote commits
2023-04-12 03:52:22 +09:00
07b9e17665
fix lookup instance
2023-04-11 10:32:51 -07:00
2d03d61ac8
consistent locales
2023-04-11 10:30:04 -07:00
6b359071be
feat: lookup post action
2023-04-11 10:12:17 -07:00
b6d2b15948
feat: index posts action
2023-04-11 10:07:03 -07:00
0979ba6b8f
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-04-11 10:03:31 -07:00
c5b0b07027
feat: admin lookup files/instance
2023-04-11 10:03:25 -07:00
c3431b928a
Partially disable search MFM ( #9830 )
...
Honestly, this workaround is pure garbage when this can be achieved by deleting a small piece of code from mfm-js, but this closes #9816 anyway 😅
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9830
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-10 05:42:17 +00:00
50fc292c7e
docs: hyperlink foundkey commits
2023-04-09 20:28:29 -07:00
6cc0c2bf99
Merge pull request 'chore: minor improvement in the Chinese locale' ( #9828 ) from naskya/calckey:chore/update-lang-menu into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9828
2023-04-08 14:22:56 +00:00
37147f8924
Update Chinese locale
2023-04-08 21:48:47 +09:00
63c35871b2
fix chat metadata
2023-04-08 00:18:37 -07:00
8491a757bc
fix
2023-04-08 00:10:16 -07:00
ee83b5b1a3
Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop
2023-04-07 23:56:06 -07:00
0717454d49
feat: mark all as read action in chat
2023-04-07 23:56:02 -07:00
594ee74324
feat: messaging room banner
2023-04-07 23:55:42 -07:00
306fcb63d4
Merge pull request 'fix: retrieve remote user again when migrating' ( #9826 ) from nmkj/calckey:fix-alsoknownas into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9826
2023-04-08 06:15:27 +00:00
4a1a954386
move hidden hashtag menu
2023-04-07 22:54:25 -07:00
e6c1090cdc
back button
2023-04-07 22:46:41 -07:00
437a6e29a5
chore: formatting
2023-04-07 22:46:10 -07:00
67dbb2318a
fetch person again
2023-04-08 01:44:50 -04:00
a624aeebe3
feat: per-user boost muting ( #9825 )
...
Cherry-picked from FoundKey/c414f24a2c ([commit](c414f24a2chttps://codeberg.org/calckey/calckey/pulls/9825
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-08 05:44:36 +00:00
6c6350aff0
Merge pull request 'feat: add hidden hashtags management page' ( #9824 ) from amybones/calckey:feat_hashtag_mgmt into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9824
2023-04-08 05:43:40 +00:00
cb68498fcb
feat: add hidden hashtags management page
...
This simply adds a basic admin UI to blocklist some hashtags from displaying in
the trending widget. The facility existed already in the backend, but there was
no UI to manipulate the list save for executing raw SQL or API calls.
2023-04-07 18:57:52 -07:00
ec807fc1bd
hotfix: fix crash
2023-04-07 17:58:29 -07:00
621be91cdb
Revert "Revert "Incorporate calckey-js into calckey repository ( #9820 )""
...
This reverts commit 8033492c7c
2023-04-07 17:44:27 -07:00
8033492c7c
Revert "Incorporate calckey-js into calckey repository ( #9820 )"
...
This reverts commit 37c0423da6
2023-04-07 17:35:10 -07:00
4fb7f4634f
fix: typo
2023-04-07 17:25:24 -07:00
49c44771e5
Merge pull request 'fix: followers transfer via account migration' ( #9822 ) from nmkj/calckey:fix-move into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9822
2023-04-08 00:06:08 +00:00
6bf1cbc0ef
fix: format script; chore: format
2023-04-07 17:01:42 -07:00
aeb0839da9
chore: rome formatting
2023-04-07 16:47:04 -07:00
62a439c693
fix move inbox
2023-04-07 17:48:25 -04:00
37c0423da6
Incorporate calckey-js into calckey repository ( #9820 )
...
Closes #9712 .
Co-authored-by: Kaity A <kaity@theallans.com.au>
Co-authored-by: Ken Allan <ken@norganna.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9820
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
2023-04-07 14:25:22 +00:00
d2b88327fe
Merge pull request 'chore: update Japanese locale' ( #9819 ) from naskya/calckey:chore/update-ja-locale-20230407 into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9819
2023-04-07 14:24:41 +00:00
b03479c7b4
fix id of move activity
2023-04-07 06:39:29 -04:00
b00cb44377
Update Japanese locale
2023-04-07 17:36:39 +09:00
3b9d9cb635
menu opts
2023-04-06 23:02:07 -07:00
0f5a6e0eef
locale
2023-04-06 22:56:25 -07:00
47bfcf66b7
Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop
2023-04-06 22:48:17 -07:00
0f6e7056b7
days for featured
2023-04-06 22:48:07 -07:00
ThatOneCalculator
naskya
naskya
Namekuji
amy bones
Kaity A