mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-25 12:08:06 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,250 Commits 15 Branches 30 Tags 1.3 GiB
65d5b279fa
Commit Graph

3542 Commits

Author SHA1 Message Date
ThatOneCalculator
35047fd19c fix typo 2023-05-10 14:19:48 -07:00
ThatOneCalculator
4393eba659 fix button 2023-05-10 14:15:19 -07:00
ThatOneCalculator
355df50004 chore: formatting 2023-05-10 14:08:51 -07:00
ThatOneCalculator
e0a9a6e891 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-10 14:06:55 -07:00
ThatOneCalculator
f49f9d281e feat: ✨ ability for moderators to send mod mail 2023-05-10 14:06:45 -07:00
April John
909b12dff2 reintroduce async into post import 2023-05-10 22:26:31 +02:00
Freeplay
70198a8db1 some semantics 2023-05-10 16:20:52 -04:00
Freeplay
09ee93d332 Use tooltips as aria-labels 2023-05-10 15:15:27 -04:00
Essem
5b37235a29 Switch to adm-zip for emoji pack handling 
Unzipper seems to corrupt files in certain cases on Node 18/19.
See https://github.com/ZJONSSON/node-unzipper/issues/271
 2023-05-09 19:19:15 -05:00
ThatOneCalculator
a6d0fc5357 Address #10076 2023-05-09 15:15:13 -07:00
ThatOneCalculator
af4a812e88 properly link aps 2023-05-08 18:19:11 -07:00
Kainoa Kanter
de450c1aa2 Merge pull request 'display new direct replies at end instead of top' (#10071) from Freeplay/calckey:direct-reply-thing into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10071
 2023-05-09 00:48:58 +00:00
Freeplay
566f11d96d display new direct replies at end instead of top 2023-05-08 19:41:56 -04:00
ThatOneCalculator
1ccd606236 fix opening info button 2023-05-08 16:26:36 -07:00
ThatOneCalculator
53b7ce83b2 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-08 16:15:11 -07:00
ThatOneCalculator
5e13a52a51 missed one 2023-05-08 16:15:04 -07:00
Freeplay
ee04acf087 fix quote attached styling, will prob improve later 2023-05-08 17:26:59 -04:00
ThatOneCalculator
7ab2670ea6 mention 2023-05-08 13:52:11 -07:00
April John
3fda23c7dd Revert "fix: run post import async" 
This reverts commit 3bedd1b34799d969cd218b4a1a67651532a204e6.
 2023-05-08 22:48:12 +02:00
ThatOneCalculator
1400a01958 example.com -> calckey.org 2023-05-08 13:39:39 -07:00
ThatOneCalculator
b92237c8d2 chore: formatting 2023-05-08 13:36:53 -07:00
ThatOneCalculator
72b224a40c Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-08 13:36:28 -07:00
ThatOneCalculator
04d0e002e9 fix: allow disabled radio buttons when created from radios.vue 2023-05-08 13:36:22 -07:00
April John
369fd4daea fix: run post import async 2023-05-08 22:30:40 +02:00
April John
3a8e6a19b2 import replies too 2023-05-08 22:09:42 +02:00
April John
77f74f51b3 try fetching replies 2023-05-08 22:09:42 +02:00
ThatOneCalculator
39c6949321 chore: formatting 2023-05-08 13:01:06 -07:00
ThatOneCalculator
3dc2a591ec Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-08 13:00:44 -07:00
ThatOneCalculator
cb292c43b4 update import-export options 2023-05-08 13:00:34 -07:00
Kainoa Kanter
5808d27b44 Merge pull request 'fix click.stop' (#10068) from Freeplay/calckey:notes into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10068
 2023-05-08 19:51:44 +00:00
Freeplay
09610b89cb fix click.stop 2023-05-08 15:39:20 -04:00
ThatOneCalculator
e5e7fb5ab2 add back #10067 except for media change 2023-05-08 12:38:56 -07:00
ThatOneCalculator
df914667e6 Revert "notes (#10067)" 
This reverts commit 84f904516c9709b8f5692e7a0d011c259a8425d9, reversing
changes made to 0c742929a53f159ef85775a436d99ab7a49e6d99.
 2023-05-08 12:37:28 -07:00
Freeplay
5cbd2a53b2 fix clicking audio & search mfm opening post 2023-05-08 13:59:39 -04:00
Freeplay
3672d8c995 fix padding 2023-05-08 13:45:00 -04:00
April John
2a69ade176 fix: dont stream hidden posts 2023-05-08 19:33:04 +02:00
April John
f950c33f79 fix: Detach push notifications.. 
..from "isRead" check. Apps will handle that theself.
 2023-05-08 11:36:32 +02:00
April John
c6d432b2d2 fix hidden post behavior 2023-05-08 11:23:30 +02:00
ThatOneCalculator
bcaf30f49f missing action + locales 2023-05-07 19:05:05 -07:00
ThatOneCalculator
c51b023ff4 calckey.org 2023-05-07 18:57:50 -07:00
ThatOneCalculator
d870b06c56 remove reference to apps.vue 2023-05-07 18:53:15 -07:00
ThatOneCalculator
07ff19008a refactor: remove internal apps page 2023-05-07 18:49:56 -07:00
ThatOneCalculator
3dce8786ef fix: only fetch admin/meta if admin 2023-05-07 18:41:31 -07:00
ThatOneCalculator
1cc33dc0de fix incomplete revert 2023-05-07 18:05:11 -07:00
ThatOneCalculator
52e67728c1 Revert "fix: hidden post federation" 
This reverts commit 8a51c73fe705d4c86886ae6b5cc2b9a8dd7dcfb8.
 2023-05-07 18:01:36 -07:00
ThatOneCalculator
d3fb7794f1 chore: format 2023-05-07 16:12:18 -07:00
ThatOneCalculator
6cab12dc24 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-07 16:11:37 -07:00
ThatOneCalculator
47e2ba724b fix instance-info if moderator but not admin 2023-05-07 16:11:20 -07:00
Freeplay
2f0d80ecd2 fix font size + remove unecessary class 2023-05-07 18:19:05 -04:00
ThatOneCalculator
97e6fd2dc3 use MkChannelList 2023-05-07 12:48:28 -07:00
ThatOneCalculator
0e925c9083 disable auto load for channels pagination 2023-05-07 12:41:08 -07:00
ThatOneCalculator
82a4bcd3a8 chore: formatting 2023-05-07 12:29:02 -07:00
ThatOneCalculator
972eed930c remove gfonts from redoc 2023-05-07 12:28:24 -07:00
ThatOneCalculator
1fd815beea Revert "Merge pull request 'Add support for CW boosting' (#10047) from supakaity/hajkey:hk/cw-boost into develop" 
This reverts commit 5e86bafb24a714f3351da0a205bc57f54332e33c, reversing
changes made to d1977fc3204e16523b3c94be2a2b1878f18dca56.
 2023-05-07 11:38:39 -07:00
April John
aa5cca8b94 fix: make userId optional cause its not used and 
should not be used lmao
 2023-05-07 16:27:49 +02:00
Kaity A
ba4e322dbf Fix up PR issues 2023-05-07 22:07:40 +10:00
Kaity A
80897d0a3c Add in edit buttons 2023-05-07 20:48:55 +10:00
Kaity A
fa9a28d230 Revert accidental commit 2023-05-07 20:30:20 +10:00
Kaity A
2c6f3a9989 Note editing 2023-05-07 20:27:25 +10:00
Kainoa Kanter
62f20383e9 Merge pull request 'feat: channel search' (#10048) from naskya/calckey:feat/search-channels into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10048
 2023-05-07 03:06:01 +00:00
Kaity A
69841bc0f0 Higlight CWs by default off 2023-05-07 11:54:31 +10:00
Kaity A
febb84645f pnpm format 2023-05-07 11:53:01 +10:00
naskya
007cb0e747 format 2023-05-07 09:46:07 +09:00
naskya
8823efa100 Not found icon 2023-05-07 09:43:11 +09:00
MeiMei
a23b4a4b36 (partially) cherry-picked from misskey/10e526b 
fix: Escape SQL LIKE

* SQL LIKE escape

* CHANGELOG
 2023-05-07 09:16:46 +09:00
naskya
b3fff542ba Modify backend for Calckey 2023-05-07 09:13:37 +09:00
Kaity A
99f15e3e1d Add support for CW boosting 2023-05-07 09:26:24 +10:00
naskya
2a26c417f7 Use phosphor icons 2023-05-07 08:08:07 +09:00
naskya
0fb14f8f43 format 2023-05-07 08:05:18 +09:00
たーびん
61df9d4752 feat: チャンネルの検索用ページとAPIの追加 
* add channel search

* move  channel search to channel list page

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com>
Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
Co-authored-by: xianon <xianon@hotmail.co.jp>
Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com>
Co-authored-by: YS <47836716+yszkst@users.noreply.github.com>
Co-authored-by: Khsmty <me@khsmty.com>
Co-authored-by: Soni L <EnderMoneyMod@gmail.com>
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com>
Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
 2023-05-07 08:00:30 +09:00
trollo
3ccf069d82 fix: hidden post federation 2023-05-06 18:27:42 +02:00
Kainoa Kanter
49d6d207da Merge pull request 'fix tiny text on mobile' (#10037) from Freeplay/calckey:notes into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10037
 2023-05-06 03:28:21 +00:00
ThatOneCalculator
a406a33cea chore: formatting 2023-05-05 18:37:13 -07:00
ThatOneCalculator
b06fe943c1 patrons as span, not div 2023-05-05 18:32:00 -07:00
Froggo
999d6074d1 Remove clutter from repost dialog by removing repost icon for non-default visibility (#10015) 
The repost dialog is pretty cluttered, and the extra repeat icon next to the visibility icon seems to be a source of the clutter. This PR removes those icons next to the visibility icon, making it so that only the icon correlating to the visibility will show.

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10015
Co-authored-by: Froggo <froggo@noreply.codeberg.org>
Co-committed-by: Froggo <froggo@noreply.codeberg.org>
 2023-05-06 00:43:34 +00:00
ThatOneCalculator
c8ec5f324d chore: format 2023-05-05 13:29:39 -07:00
ThatOneCalculator
55a80ee6f0 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-05 13:28:39 -07:00
ThatOneCalculator
5cc0ecf215 re-enable post imports 2023-05-05 13:27:52 -07:00
naskya
0a591563ca Merge branch 'develop' into fix/word-mutes 2023-05-05 19:05:32 +00:00
ThatOneCalculator
d494d18a9e fix: only show signupsDisabled if signups disabled 2023-05-05 12:04:13 -07:00
naskya
4bb2751460 Merge branch 'develop' into fix/word-mutes 2023-05-05 14:01:14 +00:00
April John
0bbd8c10ef fix: dont stream hidden posts over websocket 2023-05-05 15:53:05 +02:00
April John
feebae8a3d hide hidden posts in websocket streams 2023-05-05 15:50:50 +02:00
April John
13b5a0052e Feat: new internal post visibility "hidden" 2023-05-05 15:16:10 +02:00
April John
0be60ac6c4 Fix: properly handle timeline db errors 2023-05-05 14:30:08 +02:00
naskya
1b0fc8f2fc Remove the code snippets which didn't work 2023-05-05 16:58:42 +09:00
naskya
0e80f59dc6 I believe I finally solved the boost hard mute issue (took 3 hours) 2023-05-05 15:32:47 +09:00
naskya
e32e02b135 Merge branch 'develop' into fix/word-mutes 2023-05-05 06:31:16 +00:00
ThatOneCalculator
c6b27428aa spaces 2023-05-04 23:19:32 -07:00
naskya
a14a41b27c oops 2023-05-05 12:49:34 +09:00
naskya
59a53d8f64 Fix regex hard mutes 2023-05-05 12:36:17 +09:00
naskya
9bb79161af Fix non-ASCII word soft mutes 2023-05-05 12:23:44 +09:00
naskya
433b492a2b Fix dirty duplicated code 2023-05-05 10:38:56 +09:00
naskya
6143af2be9 Merge branch 'fix/word-mutes' of https://codeberg.org/naskya/calckey into fix/word-mutes 2023-05-05 09:47:17 +09:00
naskya
ea95a9358e Show the correct username 2023-05-05 09:46:47 +09:00
naskya
456e7c33e0 Boosts should be prioritized 2023-05-05 08:17:45 +09:00
naskya
4124f00a34 Fix missing import 2023-05-05 08:14:16 +09:00
naskya
9e62df0c8f Fix channel bug 2023-05-05 07:47:03 +09:00
naskya
c99badde3e clean up 2023-05-05 06:16:23 +09:00
naskya
2297f1c57f Merge branch 'fix/word-mutes' of https://codeberg.org/naskya/calckey into fix/word-mutes 2023-05-05 05:48:55 +09:00
naskya
ecc0dd9a9b Use original (Misskey's) implementation for hard mutes as muted reason isn't needed 2023-05-05 05:48:31 +09:00
naskya
2487608fe8 Merge branch 'develop' into fix/word-mutes 2023-05-04 20:33:11 +00:00
naskya
7b58910de8 I was confused 2023-05-05 05:26:59 +09:00
naskya
467575801b Fix missing return, typo 2023-05-05 05:22:32 +09:00
naskya
f023992ab0 Fix missing arguments 2023-05-05 05:17:16 +09:00
ThatOneCalculator
2bbeced829 margin top 2023-05-04 10:24:31 -07:00
ThatOneCalculator
fb991fc12a move button outside form 2023-05-04 10:20:27 -07:00
ThatOneCalculator
e4adb96f52 fix: external link 2023-05-04 10:10:02 -07:00
ThatOneCalculator
2a8fd82cac Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-04 10:03:02 -07:00
ThatOneCalculator
0147a202e8 feat: show message if signups are disabled 2023-05-04 10:02:53 -07:00
Freeplay
60ebd938c7 fix tiny text on mobile 2023-05-04 08:30:28 -04:00
naskya
4e60fa7193 format 2023-05-04 14:41:18 +09:00
naskya
4207ff51e7 Merge branch 'develop' into fix/word-mutes 2023-05-04 05:36:29 +00:00
naskya
775eb75428 Differentiate soft mutes and hard mutes 2023-05-04 14:20:06 +09:00
naskya
39105d0c88 Refactor soft word mutes 2023-05-04 14:13:13 +09:00
naskya
d09fc8be2b Refactor hard word mutes 2023-05-04 13:17:37 +09:00
Kainoa Kanter
f029ac46a5 Merge pull request 'fix: Don't increment boost counts of non-person actors' (#10023) from nmkj/calckey:fix-boostcount into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10023
 2023-05-03 21:57:48 +00:00
ThatOneCalculator
0a36c0f6be panos 2023-05-03 13:51:49 -07:00
Namekuji
03d9642d4b don't update if renoted by bot 2023-05-03 16:16:34 -04:00
ThatOneCalculator
d07a294f33 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-02 15:15:05 -07:00
ThatOneCalculator
6c148e35a6 add catppuccin latte 2023-05-02 15:14:44 -07:00
ThatOneCalculator
81b2fa2075 Revert "chore: theme refactor" 
This reverts commit 6953fceade5fe8a6e0cb83a10f977c0643663b91.
 2023-05-02 15:14:12 -07:00
Kainoa Kanter
1818604053 Merge pull request 'notes' (#10008) from Freeplay/calckey:notes into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10008
 2023-05-02 22:05:48 +00:00
ThatOneCalculator
af15d08bd6 fix: correctly display links to self instance URL 
Closes #9270

Co-authored-by: GitHub <futchitwo>
 2023-05-02 14:45:09 -07:00
Freeplay
a469c5e950 Add tooltips to visibility icons (#9598) 2023-05-02 15:07:46 -04:00
Freeplay
b92550ff57 fix translation box 2023-05-02 14:52:05 -04:00
Freeplay
533af79d4b Fix line color (#9997) 2023-05-02 14:50:22 -04:00
Kaity A
38a35bda27 Readd deepClone and move updated into note capture 2023-05-02 22:42:33 +10:00
Kaity A
3731ae82ee allow upstream note updates to propogate 2023-05-02 19:32:36 +10:00
Kaity A
469bee64b1 allow upstream note updates to propogate 2023-05-02 19:30:05 +10:00
Kaity A
5bfe6c0730 Merge remote-tracking branch 'origin/develop' into hk/edit-federation 2023-05-02 18:24:54 +10:00
Kaity A
a56c7fe1d8 update file sensitivity on note edit 2023-05-02 18:22:42 +10:00
Kaitlyn Allan
e58d1d7695 updates to include alt text editing 2023-05-02 17:47:16 +10:00
ThatOneCalculator
eec5c86cb3 disable post imports for now 2023-05-01 23:08:35 -07:00
ThatOneCalculator
f6428ca16b max import posts twice a month 2023-05-01 21:54:15 -07:00
ThatOneCalculator
59d9811e21 import correctly 2023-05-01 21:09:48 -07:00
ThatOneCalculator
04ce30ffb2 how in the world does this keep getting reversed 2023-05-01 20:54:02 -07:00
ThatOneCalculator
2d0ace0685 chore: formatting 2023-05-01 20:32:18 -07:00
Namekuji
b067e8abfd fix db migration 2023-05-01 18:11:56 -04:00
Freeplay
b7b7d6cce4 bring back Show More component 2023-05-01 17:02:43 -04:00
Kainoa Kanter
6a1ba9f07c Merge pull request 'Fix: 500 server error when attempting to fetch followers-only reply as guest' (#9983) from s1idewhist1e/calckey:issue/9075 into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9983
 2023-05-01 19:38:16 +00:00
Kainoa Kanter
5983543132 Merge pull request 'Fix: email validation' (#9984) from s1idewhist1e/calckey:issue/9268 into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9984
 2023-05-01 19:37:56 +00:00
Cleo
cb2fefef19 Fixing post visibility patch 
Co-authored-by: Laura Hausmann <laura@hausmann.dev>
 2023-05-01 15:42:27 +00:00
s1idewhist1e
b1bbc3ac8e fix email validation 2023-04-30 22:57:10 -07:00
s1idewhist1e
45ef53994c Wrap note fetching in a try/catch 2023-04-30 22:11:15 -07:00
Namekuji
7a23aa57e4 Merge branch 'develop' into instance-silence 2023-04-30 22:02:04 -04:00
Namekuji
5013111bee enforce follow-request from silenced users 2023-04-30 21:43:56 -04:00
Namekuji
faa5fc5dd4 suppress notification from silenced users and instances 2023-04-30 21:35:10 -04:00
ThatOneCalculator
d3f7b4c18a chore: theme refactor 2023-04-30 17:57:04 -07:00
ThatOneCalculator
1faa47f558 favicon 2023-04-30 17:14:04 -07:00