Commit Graph

23502 Commits

Author SHA1 Message Date
Kainoa Kanter 6d072bbdc7 chore: format 2023-04-07 17:18:13 -07:00
Kainoa Kanter cda17e71b0 Merge branch 'develop' into experiment/timelines 2023-04-07 17:17:59 -07: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
Kainoa Kanter 3149b3a803 limits 2023-04-07 16:46:02 -07:00
Kainoa Kanter b3c166976c locales 2023-04-07 16:45:21 -07: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
naskya b00cb44377
Update Japanese locale 2023-04-07 17:36:39 +09:00
Kainoa Kanter 327495c9f0 limits 2023-04-06 23:06:41 -07: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 67d080fecc 30 days of hot 2023-04-06 22:51:00 -07:00
Kainoa Kanter 51b908e136 Merge branch 'develop' into experiment/timelines 2023-04-06 22:49:50 -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 de39c70919 style 2023-04-06 22:03:27 -07:00
Kainoa Kanter 7a3d543438 last fix 2023-04-06 20:09:21 -07:00
Kainoa Kanter 00edb30db5 proper hot tl 2023-04-06 20:02:26 -07:00
Kainoa Kanter b31dfcd752 fix, seperate 2023-04-06 19:43:48 -07:00
Kainoa Kanter 88ff928c30 fix 2023-04-06 19:23:59 -07:00
Kainoa Kanter 2ff78829c4 fix 2023-04-06 19:09:50 -07:00
Kainoa Kanter 468b14be54 fix 2023-04-06 19:06:31 -07:00
Kainoa Kanter 7fb130b06e formatting 2023-04-06 18:56:46 -07:00
Kainoa Kanter 8229e618e9 feat: new TL layout, hot TL 2023-04-06 18:55:47 -07:00
Kainoa Kanter 0a8c1bdbc3 Revert "feat: swap home timeline with social's functionality (#9597)"
This reverts commit df68d5ffff.
2023-04-06 18:13:14 -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
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
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 bf8169dc02
dev 30 2023-04-04 22:24:30 -07:00
ThatOneCalculator f78cdb9c60
import i18n 2023-04-04 22:22:35 -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
ThatOneCalculator 9879bbe38e
display back button in note 2023-04-04 21:59:35 -07:00
ThatOneCalculator c88627fc88
back button in settings 2023-04-04 21:59:11 -07:00
ThatOneCalculator 3b5b90879c
dont change state 2023-04-04 21:53:17 -07:00
ThatOneCalculator 89a010db1b
dev27 2023-04-04 21:47:38 -07:00