mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-27 08:16:36 +03:00
Code Issues Projects Releases Packages Wiki Activity
aniyomi/app/.idea/vcs.xml

6 lines
183 B
XML
Raw Normal View History

Merge upstream up to d4dfa9a2c2a6e627256e99efb08e150a6d234964 Squashed commit of the following: commit 49c30b336d897cac64d1ce0aa6f51aa85702d304 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 19:28:32 2023 +0100 fuck lint commit 06f3f7e6b478fb3b28879a285a56d7293f97c751 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 19:26:41 2023 +0100 cleanup commit 807ea3d1a51b87d5b96e0d8297e3d329c5201bdb Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 18:51:04 2023 +0100 merge41 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/d4dfa9a2c2a6e627256e99efb08e150a6d234964 commit 2b9fe5c38984a758abe61a645fb2cfae3694dfa7 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 15:18:03 2023 +0100 fix anime tracker & airing sort commit eafc64aed08377f4e28d15a7ab5c6ec37d493c38 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 14:40:45 2023 +0100 fuck lint commit eef4ef7ef27d644640deaa3040477679330b2478 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 14:20:10 2023 +0100 fix weird "explore tabs" behaviour commit 4baf786d57fdbd08bf46ec5d2fed7ad7e6ae8875 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 13:43:13 2023 +0100 use formatTime function commit df6a85a9443061aef1c08f93c8457762a422012e Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 13:38:39 2023 +0100 fix AnimeScreen crash commit 91de0ed82e3f5a4d79e6b24016c27ec42f05b9a1 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 26 01:44:41 2023 +0100 merge40 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/69aa13bc5655813f1366b2020343091c8d2da009 commit 375a252a69bb2bc8213490d8a4eb66222cbf417e Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 21:09:34 2023 +0100 merge39 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/634ceeec50b09da25726d74c5dea6657133e1de5 commit d7aee03688019b0ecda0bef96b7e40c21f69910b Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 19:42:37 2023 +0100 merge38 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/1d144e67678a99ec7198e5efcb1410b5da4bc42e commit 89777e98b0e2b74d02745326a31ce8d92f83560b Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 17:54:17 2023 +0100 merge37 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/aca36f962516f04bbbac67c9bf54723a13076c1c commit 3fba4cbc2b8f76ab38383145e9c5b42d92ac985d Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 15:09:18 2023 +0100 merge36 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/64ad25d1b5cd68457d36fda67d96f99812a53528 commit a60268e61c148df9820febbd5059fd31a3186ade Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 13:39:08 2023 +0100 lint cleanup commit c6f81b7fdadfe7f1d9af557a615c172f9ae1f203 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 13:38:22 2023 +0100 merge35 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/eed57b80be077a9f73c36d8dc572f34f59c1ba8d commit 5f782440c62eeec9826f741b32210b04dd57dfe7 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 25 00:22:45 2023 +0100 merge34.5 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8e4cedf1735f80c604f971b0a03bf72b040cdade commit e4283fe41694dfde18595705b2b9416fe446c547 Merge: e4d31057f adb571fcb Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 24 23:21:58 2023 +0100 Merge branch 'master' into merge_upstream commit e4d31057fd18abf498df7cc86c6ef42f536c59ae Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 24 23:07:20 2023 +0100 cleanup commit 150d43e325d8172bd2e6272214ac3121c2916570 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 24 23:06:00 2023 +0100 merge34 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/489d22720a4343f198c81fe10f69d5b212bfc41a commit 76df725cabe2514a9e763e231fed9257743f9b98 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 24 20:16:18 2023 +0100 merge33 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/b7d282235dd233aac3bbdba3c9cfe7cac877b2e1 commit c07cc8dc21780f19cca4bd7e4035e3ef1faec43d Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 24 16:59:50 2023 +0100 merge32 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8a8afa46e91bfb156c58f9008ba871156bf353f9 commit a654a54b744225d4033a0d50cdf74b196bceb4bb Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 23 23:01:52 2023 +0100 Update build_push.yml commit 325e625aefc75aa4c2658a7fcbad1d3931ef9042 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 23 22:44:56 2023 +0100 merge31 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/86edce0d8705beb4f7f750a0c6f5fa4b353ec3c0 commit b8cdb9d55e268d5fd9f232b2ad148e412503e668 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Mon Nov 20 21:47:46 2023 +0100 small Episode Tracker change commit f6d430df6c136f08da9fa456f0addd17c3b8d45f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Mon Nov 20 21:18:01 2023 +0100 fuck lint commit 99eea595c015e3ba98a772f30cc71372b6629abf Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Mon Nov 20 21:15:15 2023 +0100 crash fix & add forgotten commit No idea how I didn't add it yet. Commit: https://github.com/tachiyomiorg/tachiyomi/commit/efabe801be56476bf9ee536747f39ab8d486ca12 commit 18e04b75dfe7317f2cb8719c83c1bd89051ab199 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 19:38:42 2023 +0100 merge30 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/1668be85875522721ee971afac4b46aa7da343c6 commit 3a3115304efef1c2679f2bb794de2663bbf2c8f4 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 16:45:34 2023 +0100 ktlint formt commit ea2b7fe7c02b9df3744f371aea71ce1bfb3e0a5a Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 16:05:25 2023 +0100 ktlint format again commit 05f91245ace6e251f41c77633e7f760fa9f55621 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 15:47:42 2023 +0100 klint format again commit 6215528c9d60d63b5d4a4b48e96bf54278aa7e46 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 15:37:56 2023 +0100 ktlint format commit b1f728e54a543751d40da541ab5f5bfa25af850a Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 15:24:35 2023 +0100 fix ConcurrentHashMap crash commit a34bc764b4e4f1310ae408722f5eb8c281de05fd Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 15:04:24 2023 +0100 renaming & ktlintCheck commit f1cd8f69d378d299fd9442d5efbcbcae0f431050 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 14:39:59 2023 +0100 merge29 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/772db515934b79ef407b4213087c15035588d9ad commit 2c4230376c09c80969b48dc9dee9b78b9b7ddb2b Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 13:18:41 2023 +0100 merge28 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/6922792ad110ce9194aa963674bbf2c5c1351ea1 commit fa7b8427a21971b5a1e41a54be0110878cd62918 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 19 00:36:58 2023 +0100 merge27 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/7146913c7184819417d86e6cd83aaab85bd6a798 commit e29dc62837b542ab90e49d0f78174d871b98dce6 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 18 17:28:12 2023 +0100 lint cleanup commit 85d0e49fd4724ef7179e66a5204ea3caff9de9a4 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 18 17:26:35 2023 +0100 little fix commit eeddf176912086a113fc1a5643d1dd945b146dd8 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 18 17:20:36 2023 +0100 merge26 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/c9a1bd86b58ce4a41bfc0eeb527cac9d30802353 commit a2a445fdc5bab555c55a7488b47e35bdfdc0d7db Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 18 16:01:50 2023 +0100 merge25 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/6a558ad119ff35336c2141deefc5da4b49cf4553 commit 1b6301cc958f5c1e1ca585f1605daaae611a29f9 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 18 00:21:17 2023 +0100 merge24 Also a little test to see how this whole github team works. Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/fe90546821092ce8916445ce515ba51404617d62 commit 4cbf9a813e697eb22dc3fdb8ce65ebebb32cf7cc Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 17 20:12:49 2023 +0100 merge23.5 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/6d69caf59e277a2185c1a851ffad8a00a4a93a30 commit 72a54cbb6e8738134dd05f20be1a2930b05af848 Merge: a43904531 00fb0a740 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 17 19:52:08 2023 +0100 Merge branch 'master' into MR commit a439045319eb2288475eb189dfe22421945f96f6 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 17 19:47:18 2023 +0100 merge23 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/8ff0c9d61a1d5b1cc08a3615ef4bfa3d1f04a5d2 commit 370212c6772067a23a4070b497d80c17a9c32ec3 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 17 17:00:32 2023 +0100 merge22 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/2556e9f08c768c02a581b5c147d7ea476ff42889 commit 717479961cf24ff3de744565b2475c5a78f1a12f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Nov 15 21:25:52 2023 +0100 Update StreamsCatalogSheet.kt commit 563efef3c969d3a227be76901a2d1ece077283b7 Merge: 645746aa4 2b8000b81 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Nov 15 21:11:51 2023 +0100 Merge branch 'master' into MR commit 645746aa431ed0cb5b718b81ce4f4b844e71c82f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 12 15:57:35 2023 +0100 merge21 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/7a4680603db7d80cd8a52ce83e7a8e2eef317d29 commit 4709cbedba330bb68331e52b6d22b90f6481ab68 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Nov 12 14:40:35 2023 +0100 merge20 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/ef7b285151f83b8ef679786417b82ca3227dab35 commit 096276cd6817f56ace9a89039b9ff3961e8a0b11 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 19:09:44 2023 +0100 merge19.5 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/34f7caa0fc4a0d9b4fcc4dfd69dc9cb52f11bf38 commit 82eb36b628286c098150b21fd27e38f4c1eca7b4 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 18:55:20 2023 +0100 fuck lint commit 02717061ba94df02501637217301b35e841c8093 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 18:49:20 2023 +0100 merge19 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/ec08ba05fcc6cb2c77ae64016b9eafc2125733ba commit e7b1066e3ca2a71b88031cbc81de5ca7e2dfe12c Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 17:58:02 2023 +0100 merge18 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/12e7ee9d0caaa56d551908d179788fa637768397 commit 61256a22fdc42580b42d866666be8a66d7a78f23 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 15:55:09 2023 +0100 again repositioning commit b9d42c97d6e3e6dc7309e98e8101c4990c6af58a Merge: 4732c3893 236849b6e Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 15:44:21 2023 +0100 Merge branch 'master' into MR commit 4732c3893c72629db7293f877f13387c63e687fe Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 15:43:57 2023 +0100 repositioning commit 83dcd5ea3174345717d720fe2af15b3faf55b571 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 11 15:42:22 2023 +0100 merge17 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/9a817e49bed34e11e6b24b48d738d14583440fae commit 338b54a39c2438229a55e140bb9909cbdf249bf5 Merge: 748d6101c 8b1934fc3 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 9 19:28:19 2023 +0100 Merge branch 'master' into MR commit 748d6101c02897bda93240dfa651e27cb355cca4 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 9 19:24:17 2023 +0100 small changes commit 872fc749e96e60b507305a906be70715ac74f817 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 9 18:49:35 2023 +0100 fix downloader pause commit bb9617452009f8ebf7ab55a3132e72607129b749 Merge: 59b4404c1 fd83a7e14 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Tue Nov 7 19:08:04 2023 +0100 Merge branch 'master' into MR commit 59b4404c118e3b2185f5023f99d788c08c12dba7 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Nov 4 22:10:05 2023 +0100 merge16 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/16cbcecd99c24f87b087dc7d02b8ccc93f1f1251 commit 184804f62ed04c53ecbd408814b0b54907539a4c Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 3 23:19:24 2023 +0100 merge15.5 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/d32409bd6e68a3d5e32a69eb1b3afbb407741a00 commit 6bab100f78425f591d155958044de2e3f7063fda Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 3 22:42:04 2023 +0100 Update ReaderActivity.kt commit 264b0e6127ccb9fa270c7db6a66cc38bcc9989bf Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 3 22:30:37 2023 +0100 merge15 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/cf3f2d0380e5ab70211e6aab3f45bc81da43fcf4 commit dd69ce5a12c59de82556ce01162ee41cf8c6e361 Merge: d2ccb75c6 5fd00d4a1 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Nov 3 20:14:10 2023 +0100 Merge branch 'master' into MR commit d2ccb75c605e9865f580ee63b4f2236ce1812dde Merge: 8f08a246a 5567be64f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 2 22:04:53 2023 +0100 Merge branch 'master' into MR commit 8f08a246a2e86bf13bd8b47de531929a55d4678c Merge: 9509d098a 082d9e339 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Nov 2 20:58:42 2023 +0100 Merge branch 'master' into MR commit 9509d098a0734311b757e95d57a2ae4c092bbe63 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Nov 1 18:51:57 2023 +0100 Update AnimeDownloader.kt commit 5415cbbdefef1a403132358cfa4038926119dd4e Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Nov 1 18:47:21 2023 +0100 Update AnimeDownloader.kt commit f0180e0d15e6e3d648f858f49c5932bbc22f5e00 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Nov 1 15:48:14 2023 +0100 rework anime downloader commit f3ec9da2da2b867f6b955b4fc1152c8d804230a4 Merge: fd1c6437a 67a5bccec Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Tue Oct 31 18:37:41 2023 +0100 Merge branch 'master' into MR commit fd1c6437a6fc80048d102b30789e15f0ab7556cf Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Oct 29 15:12:39 2023 +0100 merge14 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/f344831d5877d1d0a7772b00f498ddfb6e86da04 commit 9bb1a5da027a90ec95678e96479db5899a5e7ec4 Merge: 03ee4bc5f d8327e872 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Oct 29 13:58:41 2023 +0100 Merge branch 'master' into MR commit 03ee4bc5f498e34cf3c79b9713e47099d3f4ea4b Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Oct 28 23:05:13 2023 +0200 merge13 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/7f0ed58b5401251c93b7edd9569a44ca044118db commit 6dd16ca07d8074ddd00810a5eea9bf95df16b72c Merge: f0783f534 509ecedb3 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Oct 28 12:03:04 2023 +0200 Merge branch 'master' into MR commit f0783f534d9878fe3650e25a7b1b591d71e81a50 Author: Quickdev <devesh.ratra@gmail.com> Date: Fri Oct 27 15:03:11 2023 -0400 feat(player): Subtitle settings + refactor + crash fixes (#1152) Co-authored-by: jmir1 <jhmiramon@gmail.com> Co-authored-by: Abdallah <54363735+abdallahmehiz@users.noreply.github.com> commit 2431d8a858ad6866141a361565e9750653ffda29 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Oct 28 00:04:20 2023 +0200 merge12 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/0d9f8e8743b1a03f30a8a3050b9a896f337ba25f commit c6317e9589498f98c5b74f57624dd2f1a6dac9f9 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 27 23:50:37 2023 +0200 Update AdaptiveSheet.kt commit 692b566f77af5ca551c999e16d9f45b19b0197b4 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 27 23:26:45 2023 +0200 revert subs commit commit 5b1099da9d4880d2797cd55714b82545fb49bff8 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 27 21:39:46 2023 +0200 Update AdaptiveSheet.kt commit 7e14b6d2ab51fd4685ff3393355b2a13f5e6caed Merge: f51b36a75 7f9255b51 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 27 21:36:43 2023 +0200 Merge remote-tracking branch 'upstream/master' into MR commit f51b36a759d1ee0a7de27377aa7b2f45cf0f6411 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 27 20:27:23 2023 +0200 merge11 Last commit merged: https://github.com/tachiyomiorg/tachiyomi/commit/34b9c82cd0ca07ded2cd079a9cc18229a02a9a81 commit 564a959bab7c775a0c442bd16fecc0b543f91a67 Merge: b9333bedd 928a62c5a Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 27 18:50:18 2023 +0200 Merge remote-tracking branch 'origin/master' into MR commit b9333bedd75e308cf617f0a0e09009365647762f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Oct 26 19:39:29 2023 +0200 fix download button not shown commit 5d575f1e9023161a999a6d5a7fe170578032b16c Merge: e282528e6 afb921a5a Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Oct 26 18:56:43 2023 +0200 Merge remote-tracking branch 'upstream/master' into MR commit e282528e6ed0767404f41189487eae048cf72e41 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Mon Oct 23 18:27:42 2023 +0200 Revert "Translations update from Hosted Weblate (#9531)" This reverts commit 3a8e7d04fc7b72fdbd2af45ef79defec0030552a. commit 3a8e7d04fc7b72fdbd2af45ef79defec0030552a Author: Weblate (bot) <hosted@weblate.org> Date: Sat Jun 3 19:10:13 2023 +0200 Translations update from Hosted Weblate (#9531) 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 <alessandrojean@gmail.com> Co-authored-by: Ali Aljishi <ahj696@hotmail.com> Co-authored-by: AntonP <tony.pug.stark@gmail.com> Co-authored-by: Christian Elbrianno <crse@protonmail.ch> Co-authored-by: Clxff H3r4ld0 <123844876+clxf12@users.noreply.github.com> Co-authored-by: Dan <denqwerta@gmail.com> Co-authored-by: Danel Dave Barbuco <barbucodanel@gmail.com> Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com> Co-authored-by: Dexroneum <Rozhenkov69@gmail.com> Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat> Co-authored-by: FateXBlood <zecrofelix@gmail.com> Co-authored-by: Ferran <ferrancette@gmail.com> Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com> Co-authored-by: ID-86 <id86dev@gmail.com> Co-authored-by: Igor <zerrxs@gmail.com> Co-authored-by: Izxmi <heltherrivas05@gmail.com> Co-authored-by: Leonardo Falcoski <leonardo.falcoski@gmail.com> Co-authored-by: Lyfja <yassinelaoud@gmail.com> Co-authored-by: Milo Ivir <mail@milotype.de> Co-authored-by: Pitpe11 <giorgos2550@gmail.com> Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua> Co-authored-by: Swyter <swyterzone@gmail.com> Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com> Co-authored-by: Uzuki Shimamura <hzy980512@126.com> Co-authored-by: altinat <altinat@duck.com> Co-authored-by: stevenlele <stevenlele@outlook.com> commit 974d3b56f7ab84dbf39e882ebe12951478fda6a5 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Mon Oct 23 17:51:27 2023 +0200 Revert "Translations update from Hosted Weblate (#9531)" This reverts commit d78159bda875adf20168506ee7fc12d112a1b0d3. commit d78159bda875adf20168506ee7fc12d112a1b0d3 Author: Weblate (bot) <hosted@weblate.org> Date: Sat Jun 3 19:10:13 2023 +0200 Translations update from Hosted Weblate (#9531) 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 <alessandrojean@gmail.com> Co-authored-by: Ali Aljishi <ahj696@hotmail.com> Co-authored-by: AntonP <tony.pug.stark@gmail.com> Co-authored-by: Christian Elbrianno <crse@protonmail.ch> Co-authored-by: Clxff H3r4ld0 <123844876+clxf12@users.noreply.github.com> Co-authored-by: Dan <denqwerta@gmail.com> Co-authored-by: Danel Dave Barbuco <barbucodanel@gmail.com> Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com> Co-authored-by: Dexroneum <Rozhenkov69@gmail.com> Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat> Co-authored-by: FateXBlood <zecrofelix@gmail.com> Co-authored-by: Ferran <ferrancette@gmail.com> Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com> Co-authored-by: ID-86 <id86dev@gmail.com> Co-authored-by: Igor <zerrxs@gmail.com> Co-authored-by: Izxmi <heltherrivas05@gmail.com> Co-authored-by: Leonardo Falcoski <leonardo.falcoski@gmail.com> Co-authored-by: Lyfja <yassinelaoud@gmail.com> Co-authored-by: Milo Ivir <mail@milotype.de> Co-authored-by: Pitpe11 <giorgos2550@gmail.com> Co-authored-by: Rostyslav Haitkulov <info@ubilling.net.ua> Co-authored-by: Swyter <swyterzone@gmail.com> Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com> Co-authored-by: Uzuki Shimamura <hzy980512@126.com> Co-authored-by: altinat <altinat@duck.com> Co-authored-by: stevenlele <stevenlele@outlook.com> commit dfb5ca4f8e6ad27f9767d731b2a413a9a9bfd583 Merge: c19b4b5cf 92f9ab276 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Mon Oct 23 17:11:37 2023 +0200 Merge remote-tracking branch 'upstream/master' into MR commit c19b4b5cff254d16de547ce06e8adee8ee881c14 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Oct 22 18:25:03 2023 +0200 fuck lint (again) commit febf0460c0bf80a252d510ee4ceb32f0ecc393e5 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Oct 22 18:16:03 2023 +0200 fuck lint commit da3265fb7a20fd1a53261f83620feef40d988323 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Oct 22 18:08:27 2023 +0200 merge10 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/531e1c62bb8ba62f3fe84efce60210b5b5560368 commit c85576e06bc21987bc14121db2abf664f3152349 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sun Oct 22 14:11:21 2023 +0200 merge9 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/4c65c2311e09bf5dcb77327c415a6fddd12123c5 commit 67d30435333e2c81a3b3e347adec4c693cb3df7e Merge: c62f86f6c 63e95d9cb Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Oct 21 14:54:03 2023 +0200 Merge branch 'aniyomiorg:master' into MR commit c62f86f6ccd8851562aa6872b483cd84c20f4d4d Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Sat Oct 21 12:45:41 2023 +0200 merge8 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/ed5a56be60d144c917b7b09bf183c688e6d54b06 commit e99e4c2f41a3465b0806ff40bba7210bf951fe7d Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 6 18:47:44 2023 +0200 merge7 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/152fdec855cccfb479af8f74f1d4099be0ac399c commit b3c911ea286f5d77f05d6418a9fd8ac18227ca6f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Fri Oct 6 16:51:34 2023 +0200 merge6 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/22a43725833804805055e3460bb3a87f3983d533 commit f705e1918221f964f9034a786e46069d0507e39f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Thu Oct 5 14:16:41 2023 +0200 merge5 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/b4bb8556751353c06531b55f3b052217254314c0 commit 2ebf477bd18435d1560558dd9231c257425accc7 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Oct 4 21:44:23 2023 +0200 merge4 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/44383ff9500b5e5b50de53890e37aa69116168fb commit 14a8aebc60212ed78fd8eeddbf7b72d4795b7468 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Oct 4 21:33:37 2023 +0200 merge3 I hate Weblate commits! Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/e15b945e16aba1dcef5d52046cf08f9f5233cb59 commit 5ceae3116bd7c184a470fe1e67a6ea615edd0487 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Oct 4 20:24:51 2023 +0200 merge2 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/9a10656bf07a7dd35400fa6e42dd0e4889ddb177 commit 5a2a3fd0804aa2e1c8068caa01ddd13eb5e1b872 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Oct 4 13:19:33 2023 +0200 fuck lint commit c3062d2ed773dbfae6a2c9344b515fcb6f51c55b Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Wed Oct 4 13:08:36 2023 +0200 merge1 Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/f63573f25fe5361c9c1a49a77b2c371e68072736 commit 928a62c5a32c5b19ddd186a6158ea37d6e381dff Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Tue Jul 25 00:25:30 2023 +0200 Update README.md commit a883c90cd6418122f2d0dc064f4d7d0440dfdf5f Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Tue Jul 25 00:24:31 2023 +0200 Delete ic_launcher.png commit c1b7b89c635eb95d667fce4a63e28461e32ff0a0 Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Tue Jul 25 00:23:44 2023 +0200 Update README.md commit c18830714b17560c0d3cb17090f2fdd2e4f2558b Author: LuftVerbot <97435834+LuftVerbot@users.noreply.github.com> Date: Tue Jul 25 00:22:16 2023 +0200 Add files via upload
2023-11-28 01:08:16 +03:00
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
Reference in a new issue Copy permalink