e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity
23492 commits 4 branches 0 tags 373 MiB
Commit graph

3094 commits

Author SHA1 Message Date
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
Namekuji b03479c7b4 fix id of move activity 2023-04-07 06:39:29 -04:00
Kainoa Kanter 3b9d9cb635 menu opts 2023-04-06 23:02:07 -07:00
Kainoa Kanter 0f6e7056b7 days for featured 2023-04-06 22:48:07 -07: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
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 881acf9e26
typo 2023-04-04 22:59:41 -07:00
ThatOneCalculator ba67fa6ed6
oops 2023-04-04 22:55:36 -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 f78cdb9c60
import i18n 2023-04-04 22:22:35 -07:00
ThatOneCalculator 3f48a9926b
more fix 2023-04-04 22:12:55 -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 c2ac53c66b
mkv13 media list 2023-04-04 21:47:30 -07:00
amybones 006bfbd42b fix: toggling the blocking state from the instance-info admin view (#9809) 
Because the admin meta information was never loaded on this page, no amount of toggling the block or suspend sliders on the instance-info page (e.g. `https://calckey.example.com/instance-info/instance.tld`) will result in the instance actually being added to the blocklist. You could still do it from the bulk blocklist management page, but that can get unwieldy quickly if you just want to do a quick block of an instance.

Co-authored-by: amy bones <amy@spookygirl.boo>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9809
Co-authored-by: amybones <amybones@noreply.codeberg.org>
Co-committed-by: amybones <amybones@noreply.codeberg.org>
 2023-04-04 03:46:23 +00:00
ThatOneCalculator daba80177a
feat: ✨ push notifs button 
Co-authored-by: Tamania <tamaina@hotmail.co.jp>
 2023-04-03 20:36:59 -07:00
ThatOneCalculator 4478468256
fix: 🐛 go to last timeline selected 2023-04-03 16:02:09 -07:00
ThatOneCalculator b7fc6117b6
fix: buttons not showing 2023-04-03 10:03:35 -07:00
Kainoa Kanter 3e334dea24 Merge pull request 'Require timeline endpoints to return the requested limit of notes.' (#9805) from supakaity/hajkey:hk/notes-pagination into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9805
 2023-04-03 17:02:01 +00:00
Kaity A 3d93458d8b
Requested limit to be fulfilled if possible 2023-04-04 02:50:53 +10:00
amy bones b28ba9f82f
fix: changing passwords, 2fa, and password resets. 
The argon2 usage was only implemented for sign-ins which broke a bunch of other
endpoints and features.
 2023-04-03 05:14:50 -07:00
Free 8bd64c89a4 note-improvements (#9799) 
Boop!

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9799
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-04-02 21:39:25 +00:00
Kaity A a66eac0e5b
Separate cat-avatar mode and speak-as-cat nyanification 2023-04-02 21:24:12 +10:00
ThatOneCalculator 9581c0df1b
styling 2023-04-02 01:00:40 -07:00
ThatOneCalculator 4496de2040
remove console.log 2023-04-02 00:42:35 -07:00
ThatOneCalculator e10fc6b8ec
attempt fix 2023-04-02 00:21:43 -07:00
ThatOneCalculator 34613771e5
correct color for help button 2023-04-02 00:13:26 -07:00
ThatOneCalculator 38ade38f3f
fix: dialogs not coming up 2023-04-02 00:07:48 -07:00
ThatOneCalculator 565493b56f
fix button alignments 2023-04-01 23:53:31 -07:00
ThatOneCalculator 79ecd7184b
don't show delete button if profile is default 2023-04-01 23:44:59 -07:00
ThatOneCalculator 0b02be7343
style 2023-04-01 23:34:02 -07:00
ThatOneCalculator bb6d04f9c3
fix import 2023-04-01 23:28:55 -07:00
ThatOneCalculator ed35e28a2c
don't need extra template 2023-04-01 21:39:48 -07:00
ThatOneCalculator e9b45260b5
chore: 🎨 format 2023-04-01 21:10:31 -07:00