Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream #1216

Closed
wants to merge 109 commits into from
Closed

Merge upstream #1216

wants to merge 109 commits into from

Conversation

jmir1
Copy link
Member

@jmir1 jmir1 commented Nov 25, 2023

No description provided.

LuftVerbot and others added 30 commits July 25, 2023 00:22
@LuftVerbot
Add files via upload
c188307
@LuftVerbot
Update README.md
c1b7b89
@LuftVerbot
Delete ic_launcher.png
a883c90
@LuftVerbot
Update README.md
928a62c
@LuftVerbot
merge1
c3062d2 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/f63573f25fe5361c9c1a49a77b2c371e68072736
@LuftVerbot
fuck lint
5a2a3fd
@LuftVerbot
merge2
5ceae31 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/9a10656bf07a7dd35400fa6e42dd0e4889ddb177
@LuftVerbot
merge3
14a8aeb 
I hate Weblate commits!
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/e15b945e16aba1dcef5d52046cf08f9f5233cb59
@LuftVerbot
merge4
2ebf477 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/44383ff9500b5e5b50de53890e37aa69116168fb
@LuftVerbot
merge5
f705e19 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/b4bb8556751353c06531b55f3b052217254314c0
@LuftVerbot
merge6
b3c911e 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/22a43725833804805055e3460bb3a87f3983d533
@LuftVerbot
merge7
e99e4c2 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/152fdec855cccfb479af8f74f1d4099be0ac399c
@LuftVerbot
merge8
c62f86f 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/ed5a56be60d144c917b7b09bf183c688e6d54b06
@LuftVerbot
Merge branch 'aniyomiorg:master' into MR
67d3043
@LuftVerbot
merge9
c85576e 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/4c65c2311e09bf5dcb77327c415a6fddd12123c5
@LuftVerbot
merge10
da3265f 
Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/531e1c62bb8ba62f3fe84efce60210b5b5560368
@LuftVerbot
fuck lint
febf046
@LuftVerbot
fuck lint (again)
c19b4b5
@LuftVerbot
Merge remote-tracking branch 'upstream/master' into MR
dfb5ca4
@weblate @alessandrojean
@Ali-x98 @crse @clxf12 @nezumiXIV @ZzThanhBaozZ @Dexroneum @Ereza @FateXBlood @Fuu83 @giosann @ID-86 @zerrxs @Falcowoski @lyfja @milotype @Pitpe12 @nightflyza @Swyter @TheKingTermux @JHuang778 @altqx @stevenlele @LuftVerbot
Translations update from Hosted Weblate (#9531)
d78159b 
Weblate translations

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Alessandro Jean <[email protected]>
Co-authored-by: Ali Aljishi <[email protected]>
Co-authored-by: AntonP <[email protected]>
Co-authored-by: Christian Elbrianno <[email protected]>
Co-authored-by: Clxff H3r4ld0 <[email protected]>
Co-authored-by: Dan <[email protected]>
Co-authored-by: Danel Dave Barbuco <[email protected]>
Co-authored-by: DatTran MLL <[email protected]>
Co-authored-by: Dexroneum <[email protected]>
Co-authored-by: Eduard Ereza Martínez <[email protected]>
Co-authored-by: FateXBlood <[email protected]>
Co-authored-by: Ferran <[email protected]>
Co-authored-by: Giorgio Sanna <[email protected]>
Co-authored-by: ID-86 <[email protected]>
Co-authored-by: Igor <[email protected]>
Co-authored-by: Izxmi <[email protected]>
Co-authored-by: Leonardo Falcoski <[email protected]>
Co-authored-by: Lyfja <[email protected]>
Co-authored-by: Milo Ivir <[email protected]>
Co-authored-by: Pitpe11 <[email protected]>
Co-authored-by: Rostyslav Haitkulov <[email protected]>
Co-authored-by: Swyter <[email protected]>
Co-authored-by: TheKingTermux <[email protected]>
Co-authored-by: Uzuki Shimamura <[email protected]>
Co-authored-by: altinat <[email protected]>
Co-authored-by: stevenlele <[email protected]>
@LuftVerbot
Revert "Translations update from Hosted Weblate (#9531)"
974d3b5 
This reverts commit d78159b.
@weblate @alessandrojean
@Ali-x98 @crse @clxf12 @nezumiXIV @ZzThanhBaozZ @Dexroneum @Ereza @FateXBlood @Fuu83 @giosann @ID-86 @zerrxs @Falcowoski @lyfja @milotype @Pitpe12 @nightflyza @Swyter @TheKingTermux @JHuang778 @altqx @stevenlele @LuftVerbot
Translations update from Hosted Weblate (#9531)
3a8e7d0 
Weblate translations

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Alessandro Jean <[email protected]>
Co-authored-by: Ali Aljishi <[email protected]>
Co-authored-by: AntonP <[email protected]>
Co-authored-by: Christian Elbrianno <[email protected]>
Co-authored-by: Clxff H3r4ld0 <[email protected]>
Co-authored-by: Dan <[email protected]>
Co-authored-by: Danel Dave Barbuco <[email protected]>
Co-authored-by: DatTran MLL <[email protected]>
Co-authored-by: Dexroneum <[email protected]>
Co-authored-by: Eduard Ereza Martínez <[email protected]>
Co-authored-by: FateXBlood <[email protected]>
Co-authored-by: Ferran <[email protected]>
Co-authored-by: Giorgio Sanna <[email protected]>
Co-authored-by: ID-86 <[email protected]>
Co-authored-by: Igor <[email protected]>
Co-authored-by: Izxmi <[email protected]>
Co-authored-by: Leonardo Falcoski <[email protected]>
Co-authored-by: Lyfja <[email protected]>
Co-authored-by: Milo Ivir <[email protected]>
Co-authored-by: Pitpe11 <[email protected]>
Co-authored-by: Rostyslav Haitkulov <[email protected]>
Co-authored-by: Swyter <[email protected]>
Co-authored-by: TheKingTermux <[email protected]>
Co-authored-by: Uzuki Shimamura <[email protected]>
Co-authored-by: altinat <[email protected]>
Co-authored-by: stevenlele <[email protected]>
@LuftVerbot
Revert "Translations update from Hosted Weblate (#9531)"
e282528 
This reverts commit 3a8e7d0.
@LuftVerbot
Merge remote-tracking branch 'upstream/master' into MR
5d575f1
@LuftVerbot
fix download button not shown
b9333be
@LuftVerbot
Merge remote-tracking branch 'origin/master' into MR
564a959
@LuftVerbot
merge11
f51b36a 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/34b9c82cd0ca07ded2cd079a9cc18229a02a9a81
@LuftVerbot
Merge remote-tracking branch 'upstream/master' into MR
7e14b6d
@LuftVerbot
Update AdaptiveSheet.kt
5b1099d
@LuftVerbot
revert subs commit
692b566
@LuftVerbot
merge30
18e04b7 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/1668be85875522721ee971afac4b46aa7da343c6
@LuftVerbot
crash fix & add forgotten commit
99eea59 
No idea how I didn't add it yet. Commit: https://github.com/tachiyomiorg/tachiyomi/commit/efabe801be56476bf9ee536747f39ab8d486ca12
@LuftVerbot
fuck lint
f6d430d
@LuftVerbot
small Episode Tracker change
b8cdb9d
@LuftVerbot
merge31
325e625 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/86edce0d8705beb4f7f750a0c6f5fa4b353ec3c0
@LuftVerbot
Update build_push.yml
a654a54
@LuftVerbot
merge32
c07cc8d 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8a8afa46e91bfb156c58f9008ba871156bf353f9
@LuftVerbot
merge33
76df725 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/b7d282235dd233aac3bbdba3c9cfe7cac877b2e1
@LuftVerbot
merge34
150d43e 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/489d22720a4343f198c81fe10f69d5b212bfc41a
@LuftVerbot
cleanup
e4d3105
@LuftVerbot
Merge branch 'master' into merge_upstream
e4283fe
@LuftVerbot
merge34.5
5f78244 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8e4cedf1735f80c604f971b0a03bf72b040cdade
@LuftVerbot
merge35
c6f81b7 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/eed57b80be077a9f73c36d8dc572f34f59c1ba8d
@LuftVerbot
lint cleanup
a60268e
@LuftVerbot
merge36
3fba4cb 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/64ad25d1b5cd68457d36fda67d96f99812a53528
@LuftVerbot
merge37
89777e9 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/aca36f962516f04bbbac67c9bf54723a13076c1c
@LuftVerbot
merge38
d7aee03 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/1d144e67678a99ec7198e5efcb1410b5da4bc42e
@LuftVerbot
merge39
375a252 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/634ceeec50b09da25726d74c5dea6657133e1de5
@LuftVerbot
merge40
91de0ed 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/69aa13bc5655813f1366b2020343091c8d2da009
@LuftVerbot
fix AnimeScreen crash
df6a85a
@LuftVerbot
use formatTime function
4baf786
@LuftVerbot
fix weird "explore tabs" behaviour
eef4ef7
@LuftVerbot
fuck lint
eafc64a
@LuftVerbot
fix anime tracker & airing sort
2b9fe5c
@LuftVerbot
merge41
807ea3d 
Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/d4dfa9a2c2a6e627256e99efb08e150a6d234964
@LuftVerbot
cleanup
06f3f7e
@LuftVerbot
fuck lint
49c30b3
@jmir1 jmir1 closed this Nov 27, 2023
@jmir1 jmir1 deleted the merge_upstream branch January 10, 2024 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jmir1 @LuftVerbot @weblate @quickdesh