mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-23 19:18:14 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,635 Commits 15 Branches 30 Tags 1.3 GiB
fc3bb21b80
Commit Graph

2410 Commits

Author SHA1 Message Date
ThatOneCalculator
5829e92fdb feat: weblate! 2022-12-17 10:17:39 -08:00
ThatOneCalculator
bacac3eb9e Merge remote-tracking branch 'chimiana/develop' into develop 2022-12-17 09:25:08 -08:00
ThatOneCalculator
f6589655b1 chore: dockerfile cleanup 2022-12-17 09:22:25 -08:00
ThatOneCalculator
91893ea5c7 chore: lint 2022-12-16 18:28:05 -08:00
chimiana
41158e9224 Fix for #9194, converts webp to png instead of jpg, preserving transparency 2022-12-17 02:26:19 +00:00
ThatOneCalculator
f0507efeb0 fix: use correct color for MkMoved 2022-12-16 14:52:43 -08:00
ThatOneCalculator
d52ceb0150 refactor: 👥 update cleo link 2022-12-16 14:38:18 -08:00
ThatOneCalculator
e389d28b02 Fix spacing 2022-12-16 13:39:45 -08:00
ThatOneCalculator
11bf1a98d0 Fix logo icons 2022-12-16 10:50:26 -08:00
ThatOneCalculator
71f9378d35 fix: insert into correct textarea 2022-12-16 10:40:08 -08:00
ThatOneCalculator
b395874945 fix: css class match 2022-12-16 10:36:53 -08:00
ThatOneCalculator
2be8bf2078 feat: Insert text at cursor for caption 2022-12-16 10:25:05 -08:00
ThatOneCalculator
0494feb4ae fix: 🐛 fix inconsistent theming 2022-12-16 10:21:10 -08:00
Undefined
29ea572c59 Add FK abuse_user_report.targetUserId -> user.id (closes #9227) 2022-12-16 17:15:53 +01:00
PK
54c3d43ccf Make indentation not completely suck 2022-12-15 18:09:00 -06:00
cutestnekoaqua
5002f0aa2b Finalise POST-Move 2022-12-16 01:06:30 +01:00
chimiana
75b9d27494 Added _button class to nav items that were missing it 2022-12-15 23:19:04 +00:00
chimiana
e676692175 Removed tap-highlight-color from style.scsss as it is not a valid css property 2022-12-15 23:19:04 +00:00
chimiana
6cef7f5568 Updated autosize dependency to 5.0.2. This fixes #9040 as it was a bug in the dependency. 2022-12-15 23:19:03 +00:00
PK
2285812a88 Formatting 2022-12-15 16:13:48 -06:00
PK
52cc014e4d Translate portions of backend/src/remote/activitypub, the suspend-user service, and the boot process. 
Some of these weren't translated so I thought I'd do 'em cause why not ¯\_(ツ)_/¯
 2022-12-15 12:44:03 -06:00
cutestnekoaqua
49e4cd53a0 User Page redesign 2022-12-15 19:13:36 +01:00
cutestnekoaqua
32fac2c2c8 add check for already moved 2022-12-15 17:39:28 +01:00
cutestnekoaqua
ff9500b9e5 set move ratelimit to graceful 5 times. 2022-12-15 16:59:11 +01:00
cutestnekoaqua
8998bc7836 create local uri out of ID [CI SKIP] 2022-12-15 16:55:22 +01:00
cutestnekoaqua
3be1975b15 change error msg [CI SKIP] 2022-12-15 16:40:13 +01:00
cutestnekoaqua
a93990bbab revert url to uri 2022-12-15 16:33:08 +01:00
cutestnekoaqua
e84ced28ec Beta 8! 2022-12-15 13:39:42 +01:00
cutestnekoaqua
ae95540deb Unfinished refactor of User Layout 2022-12-14 21:17:06 +01:00
cutestnekoaqua
e26724b01e fix federation of moved to to pleroma 
because it expects it to be non-existant if its null.
 2022-12-14 17:19:31 +01:00
CherryKitten
bdd4e28073 Merge branch 'develop' into develop 2022-12-13 19:07:12 +00:00
CherryKitten
e875bfc5d7 Always fetch locales when initiating client 2022-12-13 20:04:29 +01:00
ThatOneCalculator
2854ed3470 revert border thickness change 2022-12-13 11:02:46 -08:00
ThatOneCalculator
5f62a449a7 feat: customizable max note length 2022-12-12 15:07:38 -08:00
ThatOneCalculator
fa2e17dc93 open page in window if deck 2022-12-12 14:39:21 -08:00
ThatOneCalculator
51c96e127a signup instead of view details 2022-12-12 14:35:01 -08:00
cutestnekoaqua
f31bd5fe48 add local move follower migration 2022-12-12 21:09:51 +01:00
cutestnekoaqua
f91f89bd1d federation 💀 2022-12-12 21:09:51 +01:00
ThatOneCalculator
33e12d047f Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-12 12:08:06 -08:00
ThatOneCalculator
2078f07fe1 cat styling 2022-12-12 12:07:53 -08:00
cutestnekoaqua
072d14df95 send moved user object back :3 2022-12-12 20:45:10 +01:00
cutestnekoaqua
9455dedd6d POV: coding at 3am bad 2022-12-12 20:44:11 +01:00
ThatOneCalculator
353537662b fix alsoKnownAs federation 2022-12-12 11:25:28 -08:00
ThatOneCalculator
7019968a3a better invite icon, fix conditional 2022-12-12 10:55:01 -08:00
ThatOneCalculator
fa21a9e489 Only show admin settings to admins 2022-12-12 10:54:24 -08:00
cutestnekoaqua
db7cc867c5 fix calckey-js | fix migration url 2022-12-12 19:36:25 +01:00
ThatOneCalculator
7a8ab8b381 fix calckeyjs 2022-12-12 10:19:18 -08:00
ThatOneCalculator
5a4c74b6ad fix ckjs 2022-12-12 10:04:57 -08:00
ThatOneCalculator
804224f92c Bug fixes, use calckey.js 2022-12-11 19:24:12 -08:00
ThatOneCalculator
3cf540e11d serverDisconnectedBehavior default to nothing 2022-12-11 18:37:36 -08:00
ThatOneCalculator
06951e7e36 3 move per day (to allow for failures) 2022-12-11 18:34:46 -08:00
ThatOneCalculator
4f9dfbc3c6 Fix UI, beta versioning 2022-12-11 18:32:19 -08:00
ThatOneCalculator
578f787e49 remove unused import 2022-12-11 18:27:58 -08:00
ThatOneCalculator
71d0a5c9ea more descriptive errors 2022-12-11 18:27:44 -08:00
ThatOneCalculator
53644b6877 typo 2022-12-11 18:24:11 -08:00
ThatOneCalculator
2039e70177 use actual ID 2022-12-11 18:19:25 -08:00
ThatOneCalculator
367e19727e Fix move endpoint 2022-12-11 18:18:07 -08:00
ThatOneCalculator
e9f36ffb8f fix: label 2022-12-11 18:00:39 -08:00
Kainoa Kanter
01f463ff7a Merge branch 'develop' into account_migration 2022-12-12 01:51:17 +00:00
ThatOneCalculator
1516e24365 final cleanup 2022-12-11 17:49:14 -08:00
ThatOneCalculator
70a953a7d8 fix: migration labels 2022-12-11 17:40:10 -08:00
ThatOneCalculator
7bba1a3e57 fix viewing basic federaion info 2022-12-11 17:36:24 -08:00
ThatOneCalculator
89eed3127e fix: call functions properly 2022-12-11 17:33:45 -08:00
ThatOneCalculator
49b41cd412 Pop-up to confirm migration 2022-12-11 17:28:11 -08:00
cutestnekoaqua
3abebba245 Add admin and account locked error. 2022-12-12 02:17:07 +01:00
ThatOneCalculator
6e283ef5e6 Reserve merge conflict 2022-12-11 17:07:57 -08:00
cutestnekoaqua
0219ed2c1d integrate migration ui and api backend 2022-12-12 01:54:44 +01:00
ThatOneCalculator
9499737cd8 fix path 2022-12-12 01:54:43 +01:00
ThatOneCalculator
f4da4b7ebb Initial migration UI 
b6

Style improvements to moved
 2022-12-12 01:54:43 +01:00
cutestnekoaqua
7b7752fb48 fix queue? 
maybe pls

debug log

fixed stupidness again

fix ??

fix import

im a idiot lol

make remote mig work
 2022-12-12 01:54:41 +01:00
cutestnekoaqua
0814b60964 change move sql query 2022-12-12 01:54:41 +01:00
cutestnekoaqua
542fb00660 WIP move api call 
forgot to merge this
 2022-12-12 01:54:36 +01:00
cutestnekoaqua
245e1bf935 fix remote move queue 2022-12-12 01:54:36 +01:00
ThatOneCalculator
fea278fbf4 Fix icons + formatting 
fix more icons
 2022-12-12 01:54:23 +01:00
ThatOneCalculator
08cd73e403 fix?? 2022-12-11 15:19:41 -08:00
ThatOneCalculator
114d554747 remove like confirmation 2022-12-11 15:09:04 -08:00
ThatOneCalculator
f500fb6a52 fix liked pages endpoint 2022-12-11 14:50:16 -08:00
ThatOneCalculator
8548ec47a9 fix liked pages 2022-12-11 14:31:30 -08:00
ThatOneCalculator
e160e0f804 fix path 2022-12-10 11:23:57 -08:00
ThatOneCalculator
f1cddf33bd Style improvements to moved 2022-12-10 10:56:45 -08:00
ThatOneCalculator
fd831572f1 Initial migration UI 2022-12-09 14:28:50 -08:00
cutestnekoaqua
d582aae655 make remote mig work 2022-12-09 01:57:15 +01:00
cutestnekoaqua
fd9c4761e5 im a idiot lol 2022-12-09 01:35:15 +01:00
cutestnekoaqua
dd3a0f2fbe fix import 2022-12-09 01:20:30 +01:00
cutestnekoaqua
8cd54ef940 fix ?? 2022-12-09 01:17:31 +01:00
cutestnekoaqua
9395ff7cfa fixed stupidness again 2022-12-09 00:11:37 +01:00
cutestnekoaqua
2ce9f10707 debug log 2022-12-09 00:08:33 +01:00
cutestnekoaqua
002d614f25 maybe pls 2022-12-08 20:02:55 +01:00
cutestnekoaqua
90a8c7135d fix queue? 2022-12-08 19:28:48 +01:00
cutestnekoaqua
85bd231a5e change move sql query 2022-12-08 15:53:37 +01:00
cutestnekoaqua
0f87b92fb3 forgot to merge this 2022-12-08 01:25:59 +01:00
cutestnekoaqua
0855b6720d WIP move api call 2022-12-08 01:05:07 +01:00
cutestnekoaqua
635290bd33 fix remote move queue 2022-12-07 18:16:37 +01:00
ThatOneCalculator
d39d7827c0 fix more icons 2022-12-06 20:16:26 -08:00
ThatOneCalculator
403e45c3c8 Fix icons + formatting 2022-12-06 20:12:44 -08:00
cutestnekoaqua
e67e798c8b pls daddy 2022-12-07 01:43:16 +01:00
cutestnekoaqua
8594f0e216 add ui back 2022-12-07 01:26:24 +01:00
cutestnekoaqua
157134a4d2 yeet japan 2022-12-07 01:16:35 +01:00
cutestnekoaqua
abe351c283 fixed it for good 2022-12-07 01:15:32 +01:00
cutestnekoaqua
09555da38f hopefully fix things.... 2022-12-07 00:56:03 +01:00
ThatOneCalculator
49ee6765c4 cleanup 2022-12-06 15:46:34 -08:00
ThatOneCalculator
f6eec87c50 Merge branch 'develop' into account_migration 2022-12-06 15:34:50 -08:00
ThatOneCalculator
3e425b81c0 Add @cutestnekoaqua as maintainer :3 2022-12-06 15:32:08 -08:00
cutestnekoaqua
a3e2897bfc found my DB mistakes 💀 2022-12-07 00:09:12 +01:00
cutestnekoaqua
795a5f0760 update person model 2022-12-06 23:49:21 +01:00
ThatOneCalculator
9992c5f86d Revert "Update deps" 
This reverts commit 726e4be958c3b6d2d02e2054af42aea1ba33a1f3.
 2022-12-06 10:38:30 -08:00
ThatOneCalculator
40bd78ab74 Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-06 10:37:58 -08:00
Johann150
ba37b6e503 client: don't use filename as alt text 
This partially reverts commit e9ab42c10afb4e27516c2d2b5e3e06630efe9edd
as explained at <https://akkoma.dev/FoundKeyGang/FoundKey/pulls/178#issuecomment-3763>.
 2022-12-06 10:37:39 -08:00
cutestnekoaqua
ee78b0f115 fix ap person to db model 
fixed entries of movedToUri and added entries of alsoKnownAs
 2022-12-06 18:05:36 +01:00
Cleo
6141e1a723 Merge pull request 'just using merge bc easier' (#9185) from recieve_moveto into account_migration 
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9185
 2022-12-06 16:56:12 +00:00
cutestnekoaqua
a3011e6b8e commit 1 of 2 of fixing the Account migration to Calckey 2022-12-06 17:46:08 +01:00
Kaity A
1f6f139ca1 Remove deadtime optimisation in skippedInstances check 2022-12-06 13:53:39 +00:00
Kayden Tebau
7ac9e0e916 Alt text in image viewer 2022-12-06 00:22:44 -08:00
ThatOneCalculator
a958d27fd7 bleh!!!! 2022-12-06 00:10:00 -08:00
ThatOneCalculator
daaca0d980 ⚗️ 2022-12-06 00:05:55 -08:00
ThatOneCalculator
6ee233b27f use unshift instead of concat 2022-12-05 23:54:39 -08:00
ThatOneCalculator
6c0b7d39ce ehhh 2022-12-05 23:49:57 -08:00
ThatOneCalculator
0775e635df delete duplicate import 2022-12-05 23:45:57 -08:00
ThatOneCalculator
a52a9156f2 copy button 2022-12-05 23:44:41 -08:00
ThatOneCalculator
025b598ed5 fix 2022-12-05 23:32:44 -08:00
ThatOneCalculator
863133d55f fix 2022-12-05 23:27:12 -08:00
ThatOneCalculator
f38ed0f25f feat: ✨ Add delete all lists 2022-12-05 23:10:44 -08:00
ThatOneCalculator
b3a1d25e04 undo temp 2022-12-05 23:05:47 -08:00
ThatOneCalculator
1e164cc94d temp 2022-12-05 23:01:34 -08:00
ThatOneCalculator
1fc69a696c collapse recent pages by default 2022-12-05 22:50:59 -08:00
ThatOneCalculator
dea66726fd Show manage lists/antennas when clicking in tl 2022-12-05 22:20:26 -08:00
ThatOneCalculator
acbee12157 linting 2022-12-05 22:14:26 -08:00
ThatOneCalculator
0f524ed62e fix 2022-12-05 22:07:44 -08:00
ThatOneCalculator
3c8349cd13 Improve sign-up screen 2022-12-05 22:02:57 -08:00
ThatOneCalculator
4fb1084335 fixes 2022-12-04 17:24:27 -08:00
ThatOneCalculator
a643fefc5c fix 2022-12-04 17:23:43 -08:00
ThatOneCalculator
dbb950d0eb movedTo -> movedToUri 2022-12-04 17:20:36 -08:00
ThatOneCalculator
de02c0fe4a fix migration 2022-12-04 13:26:24 -08:00
ThatOneCalculator
0e61b83460 fix import once and for all 2022-12-04 13:06:49 -08:00
ThatOneCalculator
3fbe6e02a1 ? 2022-12-04 13:03:17 -08:00
ThatOneCalculator
d2f28edbd7 more jb cleanups 2022-12-04 13:01:00 -08:00
ThatOneCalculator
dfbe7d7d5e pov: cleo uses jetbrains 2022-12-04 12:57:43 -08:00
ThatOneCalculator
b93d390af8 cleo ide moment 2022-12-04 12:53:55 -08:00
ThatOneCalculator
bb7678fd45 fix imports 2022-12-04 12:46:10 -08:00
ThatOneCalculator
954e79bbdd fix cleo's oopsie 2022-12-04 12:41:12 -08:00
ThatOneCalculator
6001ea5c4c Update deps 2022-12-04 11:57:56 -08:00
Kainoa Kanter
29c1b81f12 Merge pull request 'develop' (#9178) from develop into account_migration 
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9178
 2022-12-04 06:26:26 +00:00
ThatOneCalculator
9b5f0ad18c Hide share button if unavailable (closes #9175) 2022-12-03 18:45:24 -08:00
ThatOneCalculator
422a66a242 Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-03 16:02:12 -08:00
ThatOneCalculator
f8792fb983 Rename/re-icon "favorites" to "bookmarks": closes #9176 2022-12-03 16:02:03 -08:00
cutestnekoaqua
db52926594 Implement recieve moveTo 
Untested, hopefully it works..

Signed-off-by: cutestnekoaqua <waterdev@galaxycrow.de>
 2022-12-03 01:23:02 +01:00
thatonecalculator
ea7094790b take back button after quote button if combined 2022-12-01 23:37:25 -08:00
thatonecalculator
e448e11082 Consistent styling 2022-12-01 23:28:16 -08:00
thatonecalculator
88e839bf00 fix 2022-12-01 23:22:43 -08:00
thatonecalculator
e70d5a775c fix 2022-12-01 23:19:37 -08:00