natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity
23,521 Commits 19 Branches 1,625 Tags 486 MiB
Commit Graph

23521 Commits

Author SHA1 Message Date
cutestnekoaqua 9e86d5dde7
fix reloads 2023-04-08 14:31:41 +02:00
cutestnekoaqua 2464223073
locale 2023-04-08 13:51:43 +02:00
cutestnekoaqua 6e4daf8f1f
fix run 2023-04-08 13:00:38 +02:00
cutestnekoaqua e6e4c32ded
mrrr 
Co-authored-by: =?UTF-8?q?=E6=9E=9C=E7=89=A9=E3=83=AA=E3=83=B3?= <nassii74@gmail.com>
 2023-04-08 12:32:37 +02:00
cutestnekoaqua ab06c4d1eb
just leave it null 2023-04-08 12:03:07 +02:00
cutestnekoaqua 5e256b8bce
fix build 2023-04-08 11:51:57 +02:00
cutestnekoaqua 11bf4d4b32
fix MkMenu 2023-04-08 11:28:34 +02:00
Kainoa Kanter 4210c35a5a formatting 2023-04-07 23:20:17 -07:00
Kainoa Kanter 980bf31ce0 fix comments 2023-04-07 23:13:01 -07:00
Kainoa Kanter 2e9ae4b695 formatting 2023-04-07 23:07:04 -07:00
Kainoa Kanter 273fb76548 a 2023-04-07 23:06:38 -07:00
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