Kainoa Kanter
6d5129c938
move hidden hashtag menu
2023-04-07 22:54:25 -07:00
Kainoa Kanter
79ae442ba3
back button
2023-04-07 22:46:41 -07:00
Kainoa Kanter
1affde0a8c
chore: formatting
2023-04-07 22:46:10 -07:00
Namekuji
f2cf92aea1
fetch person again
2023-04-08 01:44:50 -04:00
naskya
0ef179e35f
feat: per-user boost muting ( #9825 )
...
Cherry-picked from FoundKey/c414f24a2c ([commit](c414f24a2c
))
This allows us to hide specified users' boosts from the timelines (the boosts will still be visible on their user page).
Co-authored-by: Hélène <pleroma-dev@helene.moe>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://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
Kainoa Kanter
3180baa349
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
amy bones
d562f0c3c8
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
Kainoa Kanter
8cb98945e4
hotfix: fix crash
2023-04-07 17:58:29 -07:00
Kainoa Kanter
799ac84ee3
Revert "Revert "Incorporate calckey-js into calckey repository ( #9820 )""
...
This reverts commit 8033492c7c4827fbff05782d08ae65bc3440c080.
2023-04-07 17:44:27 -07:00
Kainoa Kanter
a5c4d0a7bd
Revert "Incorporate calckey-js into calckey repository ( #9820 )"
...
This reverts commit 37c0423da6bce9b86b8f4f9a5b78f640166dd3d5.
2023-04-07 17:35:10 -07:00
Kainoa Kanter
4cf87ca92f
fix: typo
2023-04-07 17:25:24 -07:00
Kainoa Kanter
0c17baa47f
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
Kainoa Kanter
8f35b66bbb
fix: format script; chore: format
2023-04-07 17:01:42 -07:00
Kainoa Kanter
1309bafb07
chore: rome formatting
2023-04-07 16:47:04 -07:00
Namekuji
a5468a8204
fix move inbox
2023-04-07 17:48:25 -04:00
Kaity A
21905514d4
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
Kainoa Kanter
886a99ca51
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
Namekuji
177e9a50b2
fix id of move activity
2023-04-07 06:39:29 -04:00
naskya
c5464e7167
Update Japanese locale
2023-04-07 17:36:39 +09:00
Kainoa Kanter
07180d073b
menu opts
2023-04-06 23:02:07 -07:00
Kainoa Kanter
b999bf1766
locale
2023-04-06 22:56:25 -07:00
Kainoa Kanter
6e9c3d0d37
Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop
2023-04-06 22:48:17 -07:00
Kainoa Kanter
dac3b02a3f
days for featured
2023-04-06 22:48:07 -07:00
Kainoa Kanter
8646a98023
Update 'CALCKEY.md'
2023-04-07 05:40:50 +00:00
Kainoa Kanter
78ef2c996a
Update 'CALCKEY.md'
2023-04-07 05:37:46 +00:00
Kainoa Kanter
ae53b4e5d3
refactor
2023-04-06 22:28:44 -07:00
Kainoa Kanter
7b3993c83e
feat: blur muted text
2023-04-06 22:11:10 -07:00
Kainoa Kanter
37d82c3b75
Merge pull request 'feat: give reason for soft word mutes' ( #9815 ) from amybones/calckey:feat_soft_mute_reasons into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9815
2023-04-07 05:07:24 +00:00
Kainoa Kanter
d92cfb8cdf
formatting
2023-04-06 18:56:46 -07:00
amy bones
3819e921cc
feat: give reason for soft mutes
...
Bad UX when a post is muted and it just says "Some chick said something". Now
provide some context too to help people decide if they want to view something
potentially triggering.
2023-04-05 21:28:26 -07:00
Nya Candy
98e95d79b7
fix(client): userpage ui ( #9179 )
...
* fix(unverified): clip pages ui
* fix(unverified): user page width
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-05 15:45:16 -07:00
ThatOneCalculator
ada9d8206c
Revert "mkv13 media list"
...
This reverts commit c2ac53c66b5cade26afd5622ad800bec7edffa92.
2023-04-04 23:58:55 -07:00
ThatOneCalculator
49b0d2f09a
33
2023-04-04 22:59:53 -07:00
ThatOneCalculator
6718b7e26b
typo
2023-04-04 22:59:41 -07:00
ThatOneCalculator
6e032b5203
oops
2023-04-04 22:55:36 -07:00
ThatOneCalculator
a76cff2dce
dev32
2023-04-04 22:54:03 -07:00
ThatOneCalculator
6d247bbdac
chore: back button in more places
2023-04-04 22:52:41 -07:00
ThatOneCalculator
0c44ffcca2
chore: back button in control panel
2023-04-04 22:49:17 -07:00
ThatOneCalculator
a47a8afa56
final fix?
2023-04-04 22:41:57 -07:00
ThatOneCalculator
b2055907c7
dev 30
2023-04-04 22:24:30 -07:00
ThatOneCalculator
20c33e9cdf
import i18n
2023-04-04 22:22:35 -07:00
ThatOneCalculator
6ce03980c0
more fix
2023-04-04 22:12:55 -07:00
ThatOneCalculator
f730145d21
dev28
2023-04-04 22:03:38 -07:00
ThatOneCalculator
4d04fc68e5
fix
2023-04-04 22:03:24 -07:00
ThatOneCalculator
45b6449106
display back button in note
2023-04-04 21:59:35 -07:00
ThatOneCalculator
29799e36aa
back button in settings
2023-04-04 21:59:11 -07:00
ThatOneCalculator
c030a227e5
dont change state
2023-04-04 21:53:17 -07:00
ThatOneCalculator
2f4e3cdce0
dev27
2023-04-04 21:47:38 -07:00
ThatOneCalculator
6c2bafe062
mkv13 media list
2023-04-04 21:47:30 -07:00
ThatOneCalculator
6e5c008ae5
dev 26
2023-04-03 20:46:54 -07:00