mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-27 04:58:07 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,162 Commits 15 Branches 30 Tags 1.3 GiB
764f549d29
Commit Graph

2516 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
2487608fe8 Merge branch 'develop' into fix/word-mutes 2023-05-04 20:33:11 +00: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
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
ThatOneCalculator
0a36c0f6be panos 2023-05-03 13:51:49 -07: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
ThatOneCalculator
eec5c86cb3 disable post imports for now 2023-05-01 23:08:35 -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
Freeplay
b7b7d6cce4 bring back Show More component 2023-05-01 17:02:43 -04:00
Cleo
cb2fefef19 Fixing post visibility patch 
Co-authored-by: Laura Hausmann <laura@hausmann.dev>
 2023-05-01 15:42:27 +00:00
Namekuji
7a23aa57e4 Merge branch 'develop' into instance-silence 2023-04-30 22:02:04 -04:00
ThatOneCalculator
d3f7b4c18a chore: theme refactor 2023-04-30 17:57:04 -07:00
Namekuji
2072d41fcd Merge branch 'develop' into instance-silence 2023-04-30 17:52:05 -04:00
Namekuji
c8de7d818c add silenced colour 2023-04-30 17:45:45 -04:00
Namekuji
688d283986 fix params 2023-04-30 17:32:14 -04:00
Namekuji
7c08ea3232 fix meta fetch 2023-04-30 17:06:43 -04:00
ThatOneCalculator
1fb5635a4d chore: format 2023-04-30 13:27:27 -07:00
ThatOneCalculator
3191853c32 chore: up browser-image-resizer 2023-04-30 13:13:43 -07:00
Kainoa Kanter
4b3a2407c3 Merge pull request 'chore: update mfm-cheat-sheet' (#9967) from naskya/calckey:chore/mfm-cheat-sheet into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9967
 2023-04-30 19:37:35 +00:00
Freeplay
7e2d5c45d2 Merge branch 'develop' of https://codeberg.org/calckey/calckey into keyboard-accessability 2023-04-30 12:31:41 -04:00
Kaity A
6a509637d5 Implement inbound note edit federation 2023-05-01 02:29:50 +10:00
Freeplay
affeb55c01 Fix jumping to top of page when opening menu 
I also thought this would maybe fix one of the focustrap errors in the console, but no.
 2023-04-30 11:58:36 -04:00
Namekuji
f0b4e10735 use tab instead of page header 2023-04-30 11:47:39 -04:00
naskya
1d37e78ca2 use new styling method 2023-04-30 23:28:17 +09:00