Commit Graph

23510 Commits

Author SHA1 Message Date
Kainoa Kanter e3bf62f188 Merge branch 'develop' into feature/capacitor 2023-04-07 23:06:29 -07:00
Kainoa Kanter 4a1a954386 move hidden hashtag menu 2023-04-07 22:54:25 -07:00
Kainoa Kanter e6c1090cdc back button 2023-04-07 22:46:41 -07:00
Kainoa Kanter 437a6e29a5 chore: formatting 2023-04-07 22:46:10 -07:00
naskya a624aeebe3 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 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
amy bones 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
Kainoa Kanter ec807fc1bd hotfix: fix crash 2023-04-07 17:58:29 -07:00
Kainoa Kanter 621be91cdb Revert "Revert "Incorporate calckey-js into calckey repository (#9820)""
This reverts commit 8033492c7c.
2023-04-07 17:44:27 -07:00
Kainoa Kanter 8033492c7c Revert "Incorporate calckey-js into calckey repository (#9820)"
This reverts commit 37c0423da6.
2023-04-07 17:35:10 -07:00
Kainoa Kanter 4fb7f4634f fix: typo 2023-04-07 17:25:24 -07:00
Kainoa Kanter 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
Kainoa Kanter 6bf1cbc0ef fix: format script; chore: format 2023-04-07 17:01:42 -07:00
Kainoa Kanter aeb0839da9 chore: rome formatting 2023-04-07 16:47:04 -07:00
Namekuji 62a439c693 fix move inbox 2023-04-07 17:48:25 -04:00
Kaity A 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
Kainoa Kanter 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
Namekuji b03479c7b4 fix id of move activity 2023-04-07 06:39:29 -04:00
naskya b00cb44377
Update Japanese locale 2023-04-07 17:36:39 +09:00
Kainoa Kanter 3b9d9cb635 menu opts 2023-04-06 23:02:07 -07:00
Kainoa Kanter 0f5a6e0eef locale 2023-04-06 22:56:25 -07:00
Kainoa Kanter 47bfcf66b7 Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop 2023-04-06 22:48:17 -07:00
Kainoa Kanter 0f6e7056b7 days for featured 2023-04-06 22:48:07 -07:00
Kainoa Kanter 1a8ccabe37 Update 'CALCKEY.md' 2023-04-07 05:40:50 +00:00
Kainoa Kanter 3e8029f1be Update 'CALCKEY.md' 2023-04-07 05:37:46 +00:00
Kainoa Kanter df7c71b1b4 refactor 2023-04-06 22:28:44 -07:00
Kainoa Kanter c2097f9244 feat: blur muted text 2023-04-06 22:11:10 -07:00
Kainoa Kanter 1d57a0da15 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 7fb130b06e formatting 2023-04-06 18:56:46 -07:00
Kainoa Kanter 620bd697b2 fixes 2023-04-06 17:56:38 -07:00
amy bones 15b1109947
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
Kainoa Kanter 1d229a4ecf Merge branch 'develop' into feature/capacitor 2023-04-05 15:48:07 -07:00
Nya Candy 73b778de2a 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
cutestnekoaqua 238cfa2d75
meow! 2023-04-05 23:52:42 +02:00
ThatOneCalculator 2d7f227de7
Revert "mkv13 media list"
This reverts commit c2ac53c66b.
2023-04-04 23:58:55 -07:00
ThatOneCalculator 679187c779
33 2023-04-04 22:59:53 -07:00
ThatOneCalculator 881acf9e26
typo 2023-04-04 22:59:41 -07:00
ThatOneCalculator ba67fa6ed6
oops 2023-04-04 22:55:36 -07:00
ThatOneCalculator c0a7e3f02e
dev32 2023-04-04 22:54:03 -07:00
ThatOneCalculator 0135dcc016
chore: back button in more places 2023-04-04 22:52:41 -07:00
ThatOneCalculator 0b72aa748b
chore: back button in control panel 2023-04-04 22:49:17 -07:00
ThatOneCalculator 48d00217c9
final fix? 2023-04-04 22:41:57 -07:00
ThatOneCalculator 18d1f6eaaa
aaaaa 2023-04-04 22:38:16 -07:00
ThatOneCalculator 002bc7b0c0
aaaaaa 2023-04-04 22:34:48 -07:00
ThatOneCalculator bf8169dc02
dev 30 2023-04-04 22:24:30 -07:00
ThatOneCalculator f78cdb9c60
import i18n 2023-04-04 22:22:35 -07:00
ThatOneCalculator 72ac682637
Merge branch 'develop' into feature/capacitor 2023-04-04 22:14:21 -07:00
ThatOneCalculator 3f48a9926b
more fix 2023-04-04 22:12:55 -07:00
ThatOneCalculator b6e3dada80
dev28 2023-04-04 22:03:38 -07:00
ThatOneCalculator bcd5779a9d
fix 2023-04-04 22:03:24 -07:00