mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-16 07:38:05 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,575 Commits 15 Branches 30 Tags 1.3 GiB
de503010d1
Commit Graph

23575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThatOneCalculator
de503010d1 Merge branch 'develop' into beta 2023-04-12 17:35:54 -07:00
ThatOneCalculator
c750e05985 dev35 2023-04-12 17:34:51 -07:00
naskya
9751de9820 chore: update mfm-js version (#9844) 
This resolves #9757.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9844
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
 2023-04-13 00:33:53 +00:00
ThatOneCalculator
9ba0a3df24 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-12 17:19:17 -07:00
ThatOneCalculator
b62549cf69 chore: formatting 2023-04-12 17:19:14 -07:00
Kainoa Kanter
9597460c93 Merge pull request 'feat: allow users to mute their own boosts' (#9841) from naskya/calckey:allow-mute-my-boosts into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9841
 2023-04-12 23:35:46 +00:00
ThatOneCalculator
a52fdea655 chore: up pnpm 2023-04-12 14:19:43 -07:00
naskya
845285fad6 correct position 2023-04-12 20:24:54 +09:00
naskya
58b3950680 Allow to mute my own boosts 2023-04-12 15:52:46 +09:00
Kainoa Kanter
485f43d2c5 Merge pull request 'Hyperlink more remote commits' (#9839) from naskya/calckey:calckey-md into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9839
 2023-04-11 19:57:51 +00:00
naskya
e0b2bf846a Hyperlink more remote commits 2023-04-12 03:52:22 +09:00
ThatOneCalculator
3b251e3a46 fix lookup instance 2023-04-11 10:32:51 -07:00
ThatOneCalculator
c6b7973179 consistent locales 2023-04-11 10:30:04 -07:00
ThatOneCalculator
53b21cd455 feat: lookup post action 2023-04-11 10:12:17 -07:00
ThatOneCalculator
fce8b16144 feat: index posts action 2023-04-11 10:07:03 -07:00
ThatOneCalculator
b1e1c1957c Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-11 10:03:31 -07:00
ThatOneCalculator
9b65711193 feat: admin lookup files/instance 2023-04-11 10:03:25 -07:00
naskya
9abd49bc88 Partially disable search MFM (#9830) 
Honestly, this workaround is pure garbage when this can be achieved by deleting a small piece of code from mfm-js, but this closes #9816 anyway 😅

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9830
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
 2023-04-10 05:42:17 +00:00
ThatOneCalculator
f35a40a537 docs: hyperlink foundkey commits 2023-04-09 20:28:29 -07:00
Kainoa Kanter
987898435d Merge pull request 'chore: minor improvement in the Chinese locale' (#9828) from naskya/calckey:chore/update-lang-menu into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9828
 2023-04-08 14:22:56 +00:00
naskya
c46325afc8 Update Chinese locale 2023-04-08 21:48:47 +09:00
Kainoa Kanter
5f0103dff1 fix chat metadata 2023-04-08 00:18:37 -07:00
Kainoa Kanter
ce9c671816 fix 2023-04-08 00:10:16 -07:00
Kainoa Kanter
a9a1f91658 Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop 2023-04-07 23:56:06 -07:00
Kainoa Kanter
ca0189f1fd feat: mark all as read action in chat 2023-04-07 23:56:02 -07:00
Kainoa Kanter
9be3fca2b8 feat: messaging room banner 2023-04-07 23:55:42 -07:00
Kainoa Kanter
5f6358c4bd Merge pull request 'fix: retrieve remote user again when migrating' (#9826) from nmkj/calckey:fix-alsoknownas into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9826
 2023-04-08 06:15:27 +00:00
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