1
0
mirror of https://github.com/NekoX-Dev/NekoX.git synced 2024-12-13 19:51:10 +01:00
Commit Graph

217 Commits

Author SHA1 Message Date
DrKLO
c44841a55b Update to 7.5.0 (2245) 2021-02-24 08:02:54 +07:00
世界
5c75f74b1d
Merge upstream 7.5.0 (2244) 2021-02-24 06:10:36 +08:00
DrKLO
92cfded3fc Update to 7.5.0 (2243) 2021-02-23 18:53:38 +07:00
世界
2debb39e74
Update dependencies 2021-02-06 22:27:14 +08:00
世界
c7f786a112
Merge upstream 7.4.0 (2223) 2021-01-29 01:03:44 +08:00
DrKLO
77bbe5baec Update to 7.4.0 (2221) 2021-01-28 17:15:51 +03:00
世界
41584af04b
Revert "Revert "max account to 32""
This reverts commit cc4402d4
2021-01-16 22:26:06 +08:00
世界
60e0b895f6
Remove custom server 2021-01-12 10:57:16 +08:00
世界
6672813cd9
Update boringssl 2020-12-30 16:48:06 +08:00
世界
261677c101
Merge upstream 7.3.0 (2196) 2020-12-24 13:53:38 +08:00
DrKLO
4b588b90aa Update to 7.3.0 (2196) 2020-12-24 09:36:01 +04:00
世界
1bfe2dc0d7
Merge remote-tracking branch 'upstream/master' 2020-12-23 17:13:40 +08:00
DrKLO
d52b2c921a Update to 7.3.0 (2195) 2020-12-23 11:48:30 +04:00
世界
0072eaaab0
Allow login with qr & Refine its scan 2020-11-28 15:39:40 +08:00
世界
58edbe46fd
Don't alert "Proxy unavailable" for non-current account. 2020-11-04 14:08:20 +00:00
世界
a7110adb4c
Fix photo list
Update boringssl, libwebp
2020-10-31 14:25:23 +00:00
世界
767c9897af
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/AndroidManifest.xml
#	TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PaymentFormActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
2020-10-30 14:57:47 +00:00
DrKLO
aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
世界
cc1209b617
Refinds 2020-10-13 14:53:22 +00:00
世界
e7deda98a5
Merge remote-tracking branch 'upstream/master' 2020-10-05 01:53:04 +00:00
DrKLO
d3ad1316c4 Update to 7.1.3 (2100) 2020-10-05 01:13:31 +03:00
世界
244a082e96
Migrate to CMake 2020-10-04 10:41:56 +00:00
世界
267a5d821c
Merge remote-tracking branch 'upstream/master' 2020-10-03 03:00:30 +00:00
DrKLO
75d0903666 Update to 7.1.2 (2098) 2020-10-03 00:48:16 +03:00
世界
490f26fc4b
Merge remote-tracking branch 'upstream/master' 2020-10-01 09:01:48 +00:00
DrKLO
4992f231b3 Update to 7.1.1 (2094) 2020-10-01 04:59:32 +03:00
DrKLO
1139e12ef1 Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
世界
65d015b3b3
Refinds 2020-09-22 09:22:06 +00:00
世界
8cd55728b1
Merge remote-tracking branch 'upstream/master' 2020-08-22 00:08:39 +00:00
DrKLO
e33a2fbedc Update to 7.0.1 (2065) 2020-08-22 02:59:49 +03:00
Danny Lin
e5fa25c27a
[TF][FIX] Update usage of FFmpeg to fix infinite loop (#436)
Error when using newer version of ffmpeg:

Upon further investigation, this error comes from newer versions of
FFmpeg [1] as the packet read callback's expected return value on EOF
has been changed. This commit fixes the issue by updating the packet
read callback used to play videos with FFmpeg to return AVERROR_EOF on
EOF instead of 0 as seen in mpv [2].

[1] https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
[2] e9dc4ac86f
2020-08-20 09:02:03 +00:00
dependabot-preview[bot]
860f8a364b
Update libraries 2020-08-20 09:01:50 +00:00
世界
b171bfac02
Merge remote-tracking branch 'upstream/master' 2020-08-16 01:13:38 +00:00
DrKLO
4c5f32babf Update to 7.0.0 (2064) 2020-08-16 00:06:36 +03:00
世界
1421c1a5d7
Merge remote-tracking branch 'upstream/master' 2020-08-15 05:36:15 +00:00
DrKLO
6e495f54b8 Update to 7.0.0 (2061) 2020-08-15 03:01:55 +03:00
DrKLO
321b756367 Update to 7.0.0 (2060) 2020-08-14 19:58:22 +03:00
世界
3654e6ad97
Refind build scripts 2020-07-29 05:22:24 +00:00
世界
5e8de25641
Merge remote-tracking branch 'upstream/master' 2020-07-27 00:58:40 +00:00
DrKLO
320710366d Update to 6.3.0 (2042) 2020-07-27 00:11:01 +03:00
DrKLO
520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +03:00
NekoInverter
ddf1841ed1
Bug fixes 2020-06-26 05:40:24 +00:00
世界
5eb5f9de51
Native changes 2020-06-25 14:02:59 +00:00
世界
e046f5090b
Make it NekoX 2020-06-25 13:59:03 +00:00
thermatk
0cfe8e4b78
[TF][JNI][FIX] ffmpeg header included and patched
I guess upstream did the same and forgot to document.
isom.h is included in a form patched to stop annoying the compiler, dv.h in the original form

(cherry picked from commit c4a947d3779fa84c9ca0aa4d05a9532634b08e24)
2020-06-24 07:30:31 +00:00
thermatk
a13d870030
[TF][JNI][UPDATE] BoringSSL from source (master)
(cherry picked from commit 71c5118dede745e259bfee96f5342c968bdac532)
2020-06-24 07:30:31 +00:00
thermatk
323d6ab5ee
[TF][JNI][UPDATE] FFmpeg 4.2.3 from source
(cherry picked from commit 37ba1e1882cae4644eb2c7c53866c47e1fa1780c)
2020-06-24 07:30:30 +00:00
thermatk
2acef2c17a
[TF][JNI][UPDATE] libwebp source to 1.0.1
(cherry picked from commit 3cbfb8fd0861fda50ec900a3161fe2a371a5068c)
2020-06-24 07:30:30 +00:00
thermatk
be5be13f8d
[TF][JNI] Add $(LOCAL_PATH) to LOCAL_C_INCLUDES
(cherry picked from commit 82b1f9b3b3e6df229608107911726e966fe69c14)
2020-06-24 07:30:30 +00:00
thermatk
95f9890591
[TF][JNI] remove native deps to be replaced
(cherry picked from commit b0e8f67540c7671e4ad5461685145cc155e090da)
2020-06-24 07:30:29 +00:00
NekoInverter
89ccde3c7a
Merge remote-tracking branch 'telegram/master' 2020-06-05 08:04:52 +08:00
DrKLO
dceccae0b7 Update to 6.2.0 (1984)
https://github.com/DrKLO/Telegram/pull/1561
2020-06-04 19:47:15 +03:00
NekoInverter
d4aba739d0
Merge remote-tracking branch 'telegram/master' 2020-04-24 20:47:41 +08:00
DrKLO
ae0d24ebf2 Update to 6.1.0 (1938) 2020-04-24 12:21:58 +03:00
NekoInverter
33d49afbcf
Merge remote-tracking branch 'telegram/master' 2020-03-31 08:53:50 +08:00
DrKLO
ce5e817fb5 Update to 6.0.1 (1910) 2020-03-30 19:49:17 +03:00
NekoInverter
71a37d1d61
Merge remote-tracking branch 'telegram/master' 2020-03-30 21:25:47 +08:00
DrKLO
80c4acfa3b Update to 6.0.0 (1908) 2020-03-30 15:00:09 +03:00
NekoInverter
cc4402d428
Revert "max account to 32"
This reverts commit a83dd3b1
2020-02-18 17:55:29 +08:00
NekoInverter
77fae32f94
Merge remote-tracking branch 'telegram/master' 2020-02-16 11:12:24 +08:00
DrKLO
df90eface5 Update to 5.15.0 (1869) 2020-02-15 21:17:30 +03:00
NekoInverter
84eb8de989
Merge remote-tracking branch 'telegram/master' 2020-02-14 10:42:24 +08:00
DrKLO
071d511494 Update to 5.15.0 (1866) 2020-02-13 23:45:02 +03:00
DrKLO
2eafc07314 Update to 5.15.0 (1864) 2020-02-13 21:26:53 +03:00
Riko Sakurauchi
7d2e26c7b5
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-23 21:04:14 +08:00
DrKLO
29aa3efe1e Update to 5.14.0 (1847) 2020-01-23 15:58:50 +03:00
Riko Sakurauchi
1f0732ebc1
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-23 20:13:43 +08:00
DrKLO
30d603778d Update to 5.14.0 (1846) 2020-01-23 09:15:40 +03:00
Riko Sakurauchi
a83dd3b105
max account to 32 2020-01-11 00:05:14 +08:00
NekoInverter
3279799241
test backend 2020-01-10 23:42:19 +08:00
Riko Sakurauchi
70f9bb86a1
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-09 00:04:58 +08:00
DrKLO
31736964fa Update to 5.13.1 (1829) 2020-01-06 17:02:23 +03:00
DrKLO
06f4895201 Update to 5.13.1 (1828) 2020-01-05 21:39:58 +03:00
DrKLO
dd07a925ee Update to 5.13.1 (1827) 2020-01-05 14:50:11 +03:00
Riko Sakurauchi
dcfce27891
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-04 00:14:05 +08:00
DrKLO
44dadb1055 Update to 5.13.1 (1824) 2020-01-03 18:45:22 +03:00
Riko Sakurauchi
107fe3dfbe
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-03 10:04:13 +08:00
DrKLO
12caa1e8cd Update to 5.13.0 (1823) 2020-01-02 18:08:53 +03:00
Riko Sakurauchi
bc0f7825b5
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-02 16:28:58 +08:00
DrKLO
1eea3ab6f7 Update to 5.13.0 (1820)
Merged some parts of https://github.com/DrKLO/Telegram/pull/1541
2020-01-01 21:32:12 +03:00
Riko Sakurauchi
0326c187ad
Merge remote-tracking branch 'telegram/master' 2020-01-01 22:14:58 +08:00
DrKLO
cc1dc35742 Update to 5.13.0 (1819) 2019-12-31 22:46:59 +03:00
DrKLO
f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +03:00
Riko Sakurauchi
b00b9446c4
Merge branch 'master' of github.com:DrKLO/Telegram 2019-09-14 12:26:08 +08:00
DrKLO
28eb8dfd0e Update to 5.11.0 2019-09-10 13:56:11 +03:00
Riko Sakurauchi
9b19ea224e
Merge branch 'master' of github.com:DrKLO/Telegram 2019-08-26 21:42:18 +08:00
DrKLO
53e04b55fb Update to 5.10.0 2019-08-22 01:53:26 +02:00
Riko Sakurauchi
3c4830634f
Merge branch 'master' of github.com:DrKLO/Telegram 2019-07-19 22:22:54 +08:00
DrKLO
ff5735503e Update to 5.9.0 2019-07-18 20:01:39 +07:00
NekoInverter
d5d5ceb104 max accounts to 8 & support installing apk 2019-06-11 14:12:22 +08:00
NekoInverter
3de186f463 build changes 2019-06-11 13:42:45 +08:00
NekoInverter
08bee5f454 Merge remote-tracking branch 'fix/fix-clang-libc++-issues' 2019-06-05 12:45:26 +08:00
NekoInverter
b81df0f660 Merge remote-tracking branch 'fix/fix-windows-gradle-issue' 2019-06-05 12:38:35 +08:00
NekoInverter
bb1ceeb829 Merge remote-tracking branch 'fix/fix-warnings' 2019-06-05 12:38:17 +08:00
DrKLO
9ffc7787d6 Update to 5.7.1 2019-06-04 13:14:50 +03:00
DrKLO
96247ca2bc Removed submodule 2019-06-04 13:02:52 +03:00
DrKLO
2cf2a45aca Update to 5.6.1 2019-05-14 15:08:05 +03:00
DrKLO
e397bd9afd Update to 5.4.0 2019-03-03 20:40:48 +00:00
DrKLO
f338a88eb4 Update to 5.3.1 2019-02-08 05:30:32 +03:00
DrKLO
ae90d60e0c Update to 5.2.1 2019-01-23 20:03:33 +03:00