161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-24 13:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,947 Commits 10 Branches 22 Tags 1.5 GiB
e17691df43
Commit Graph

25947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CGsama
62cc362822 Merge commit '97a0127dbf0b96203902fb075b1d51659a921bfc' 
Conflicts:
	pnpm-lock.yaml
 2023-07-16 20:39:26 -04:00
ThatOneCalculator
8040a0093a changelog 2023-07-16 16:49:24 -07:00
ThatOneCalculator
4c11ffa6cf docs: 📝 changelog 2023-07-16 16:40:57 -07:00
Kainoa Kanter
91ea8b4c03 Merge pull request '[PR]: Make json5 as production dependency' (#10500) from mizunashi-mana/calckey:move-json5-to-prod-dependencies into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10500
 2023-07-16 22:36:49 +00:00
Kainoa Kanter
9a0865da9a Merge branch 'develop' into move-json5-to-prod-dependencies 2023-07-16 22:34:49 +00:00
ThatOneCalculator
7904fcbeab chore: 🎨 format 2023-07-16 15:33:17 -07:00
ThatOneCalculator
1af054748f Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-16 15:32:45 -07:00
ThatOneCalculator
d425c29347 refactor: 🚨 linting fix 2023-07-16 15:32:32 -07:00
freeplay
6ddb96a392 feat: add view on remote server to user profile dropdowns 2023-07-16 17:46:30 -04:00
freeplay
e858e13fd3 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-16 17:25:12 -04:00
freeplay
311b9beaa1 fix: unable to scroll through reactions on mobile 2023-07-16 17:24:34 -04:00
ThatOneCalculator
a88a85db99 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-16 13:57:46 -07:00
ThatOneCalculator
2ac7a750ec dev79 2023-07-16 13:57:38 -07:00
ThatOneCalculator
8fc56cae94 Merge branch 'fix/ssrf' into develop 2023-07-16 13:57:27 -07:00
Kainoa Kanter
a808f3a521 Merge pull request '[PR]: Fixes Post Import from Certain Mastodon Instances' (#10473) from dvd/calckey:fix/post-import into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10473
 2023-07-16 20:51:47 +00:00
Kainoa Kanter
9818dc907f Merge pull request '[PR]: Fix Quicktime (.mov) Video Player on Chrome' (#10503) from dvd/calckey:fix/quicktime-on-chrome into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10503
 2023-07-16 18:14:51 +00:00
freeplay
8f7a9e9557 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-16 13:42:21 -04:00
freeplay
90738efa67 fix: more reliable not closing emoji picker on shift key 2023-07-16 13:41:55 -04:00
DVD
9c245e6031 Fix: Quicktime Video Play on Chrome 2023-07-16 21:56:08 +08:00
CGsama
b283b65151 support new zip file by mastodon 2023-07-16 06:24:37 -04:00
Mizunashi Mana
9fbcdb529e feat: Move json5 to prod dependencies 2023-07-16 19:00:51 +09:00
CGsama
578cfd2ac7 Update pnpm-lock.yaml 2023-07-16 04:07:55 -04:00
CGsama
07061712a2 change wording 2023-07-16 03:24:37 -04:00
CGsama
48133e4646 fix format 2023-07-16 01:47:06 -04:00
CGsama
9339868636 use gunzip-maybe tar-stream to replace exec 2023-07-16 01:41:57 -04:00
CGsama
28b92d8c16 handle import mastodon package 2023-07-15 23:02:00 -04:00
コルセット姫@がんばらない
17124f3834 feat: ✨ Add media to Mastodon and Calckey post imports (#10496) 
### What does this PR do?

Adding files fields in the export notes option, and corresponding import notes

Current the mastodon import does not import any attachments, this pr will use the "upload from url" feature to include medias if its a valid URL.

There are many way to convert the outbox.json file, can be simple as upload media_attachments to any web hosting and do string replace on the json file.

I also create a tool that upload the tar.gz file with auto convert and host the media as simplify the process at https://tempfile.moegirl.live

Detail example can be found at https://fedi.moegirl.live/notes/9h76gtqnp2gwl5dz

https://r2temp.moegirl.live/2023/7/15/15356683-050f-423a-b331-c9a05561f52a/shana-settings-_-meng-zhai-le-yuan-xyou-yu-ou-xiang-de-luo-ke-ke-wu-yan-moe-otaku-elysian-x-gloomily-idol-s-rococo-luncheon----mozilla-firefox-private-browsing-2023-07-15-18-36-37.mp4

Co-authored-by: CGsama <CGsama@outlook.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10496
Co-authored-by: コルセット姫@がんばらない <cgsama@noreply.codeberg.org>
Co-committed-by: コルセット姫@がんばらない <cgsama@noreply.codeberg.org>
 2023-07-15 22:56:09 +00:00
ThatOneCalculator
3ee2dc787b docs: 💡 going past DB_MAX_NOTE_TEXT_LENGTH 2023-07-15 15:32:39 -07:00
ThatOneCalculator
5324d1298f fix: 🔧 max post length 100000 
Pleroma doesn't accept >100K (ref: https://blob.cat/objects/82f33d96-534f-45ee-902a-f77c2723db8b)
 2023-07-15 14:50:23 -07:00
ThatOneCalculator
7308d9f90f dev78 2023-07-15 14:28:44 -07:00
ThatOneCalculator
74dbe0c846 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-15 14:22:36 -07:00
ThatOneCalculator
2913eddbce we be renamin 2023-07-15 14:21:17 -07:00
ThatOneCalculator
6bc25eb38b Merge branch 'develop' into rebrand 2023-07-15 14:15:01 -07:00
ThatOneCalculator
b8fcd0dc33 fix: 🔒 prevent potential SSRF through media proxy 2023-07-15 14:13:21 -07:00
freeplay
1048bcbff4 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-15 15:26:31 -04:00
freeplay
d0cc2d8af5 fix: move nowrap to proper place 2023-07-15 15:26:15 -04:00
Hosted Weblate
ac05a53089 chore: Merge branch 'origin/develop' into Weblate. 2023-07-15 21:22:15 +02:00
Xalis Ratt
21e8f5bf23 chore: Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/uk/
 2023-07-15 21:22:15 +02:00
Rauf
0978a210cb chore: Translated using Weblate (Turkish) 
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/tr/
 2023-07-15 21:22:11 +02:00
Cold Ravioli
d64a72c806 chore: Translated using Weblate (Spanish) 
Currently translated at 86.9% (1592 of 1831 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/
 2023-07-15 21:22:09 +02:00
freeplay
9117455832 fix: note detailed tabs using wrong styling 2023-07-15 15:21:33 -04:00
Rauf
c8d3f5571a chore: Translated using Weblate (Turkish) 
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/tr/
 2023-07-15 09:52:18 +02:00
jolupa
85167cf15d chore: Translated using Weblate (Catalan) 
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
 2023-07-15 09:52:12 +02:00
ThatOneCalculator
63d28adeff fix: 🐛 allow up to 1024 chars for SMTP login 
Closes #10472
 2023-07-15 00:19:09 -07:00
ThatOneCalculator
d33f74adda chore: 🎨 format 2023-07-15 00:06:53 -07:00
ThatOneCalculator
4be5f3b58c refactor: 🗑️ deprecate DB_MAX_NOTE_TEXT_LENGTH 2023-07-15 00:06:42 -07:00
ThatOneCalculator
49f543cebc docs: 📝 descriptions for notes/children+conversation endpoints 2023-07-14 23:16:50 -07:00
ThatOneCalculator
91a10a0394 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-14 23:13:42 -07:00
ThatOneCalculator
f4776712a3 refactor: ♻️ correct params for notes/children+conversion 2023-07-14 23:13:32 -07:00
Hosted Weblate
233b9204b8 chore: Merge branch 'origin/develop' into Weblate. 2023-07-15 08:03:25 +02:00