1
0
mirror of https://github.com/NekoX-Dev/NekoX.git synced 2024-12-14 14:00:32 +01:00
Commit Graph

1336 Commits

Author SHA1 Message Date
世界
023e6639c4
Merge upstream 7.7.1 (2291) 2021-04-17 08:13:31 +08:00
DrKLO
c4ada53b0d Update to 7.7.1 (2291) 2021-04-17 02:59:59 +03:00
世界
024578a13a
Bump version 2021-04-14 13:33:18 +08:00
世界
f36e97a63a
Fix crash 2021-04-14 13:32:05 +08:00
世界
044a1bd8b0
Fix not noGcm can't install 2021-04-14 13:24:47 +08:00
世界
4fdb6eb283
Fixes 2021-04-14 12:23:21 +08:00
世界
e84cae9de1
Resolve conflicts 2021-04-14 10:36:08 +08:00
世界
aa21a87a10
Merge upstream 7.7.0 (2284)
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/google-services.json
#	TMessagesProj/jni/TgNetWrapper.cpp
#	TMessagesProj/jni/tgnet/ConnectionsManager.h
#	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/ImageLocation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaController.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/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/WearDataLayerListenerService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/SimpleTextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogMeUrlCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.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
2021-04-14 10:15:57 +08:00
DrKLO
8bf056e27b Update to 7.7.0 (2284) 2021-04-14 04:44:46 +03:00
世界
9b15e641e5
Update shadowsocks 2021-04-14 09:14:52 +08:00
世界
1ba8675f64
Update README 2021-04-14 09:13:17 +08:00
世界
c18c9ac4dc
Minor fixes 2021-04-14 09:05:02 +08:00
世界
91db8f4bd7
Fix build script 2021-04-14 08:03:56 +08:00
世界
735fdcf2b8
Fix ci build 2021-04-13 14:50:01 +08:00
Weblate (bot)
2596ecf6ac
Translations update from Weblate (#463)
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Navid JA <navid.jadidy@gmail.com>
Co-authored-by: Hong Quan <keokiet@yahoo.com>
Co-authored-by: mecqor labi <mecqorlabi@gmail.com>
Co-authored-by: Ahmet <NaytSeyd@yandex.com>
2021-04-13 14:46:15 +08:00
世界
015b1f9086
Allow direct send to linked group 2021-04-13 14:41:58 +08:00
世界
2441154750
Prevent to enable ws relay before login 2021-04-13 13:53:31 +08:00
世界
a0bce539d3
Option to auto lock immediately 2021-04-13 13:19:05 +08:00
世界
865e4b9b9a
Option to hide message 2021-04-13 12:51:17 +08:00
世界
3168b0d38f
Fix import ssr link 2021-04-13 11:08:07 +08:00
世界
abb3f31b38
Update dependencies 2021-04-13 11:08:06 +08:00
世界
7b3f82ac3d
Exclude unused files 2021-04-13 11:08:06 +08:00
世界
ea31d82c6e
Add version suffix for fdroid builds 2021-04-13 11:08:06 +08:00
世界
2c28b02448
Use shared okhttp client 2021-04-13 11:08:06 +08:00
世界
487b6877dc
Update translations (dirty) 2021-04-11 09:14:56 +08:00
世界
58942794e3
Minor fixes 2021-04-11 08:53:15 +08:00
世界
5d88b7c83e
Increase proxy timeout 2021-04-11 08:42:31 +08:00
世界
ae7023e9d4
Run debug native build for debug build type 2021-04-11 08:42:05 +08:00
世界
a9a6b72a42
Fix proxy usage before login 2021-04-11 03:12:18 +08:00
世界
1ecfe3a9b0
Fix incorrect mapper usage 2021-04-11 02:56:11 +08:00
世界
579e722873
Fix gcm 2021-04-11 02:51:50 +08:00
世界
50d7d66373
Fix gradle build 2021-04-11 02:51:50 +08:00
世界
3562aad367
Fix missing lollipop requirement 2021-04-11 02:51:50 +08:00
世界
1bdf9da53a
Fix shadowsocks build 2021-04-11 02:51:50 +08:00
世界
ba6a717ae5
Update shadowsocks-rust to v1.10.3 2021-04-11 02:51:50 +08:00
世界
543e479b22
Update v2ray-core to 4.37.2 2021-04-11 02:51:50 +08:00
dependabot-preview[bot]
86b3043291
Bump firebase-messaging from 21.0.1 to 21.1.0 (#460)
Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-04-11 02:51:50 +08:00
秋のかえで
e84e03224c
feat: add vmess zero (#461) 2021-04-11 02:51:50 +08:00
秋のかえで
2b27049a51
feat: set alterId to 0 by default (#462) 2021-04-11 02:51:50 +08:00
世界
2b1f7bfe81
Bump version 2021-04-11 02:51:50 +08:00
世界
72ec881744
Disable share options for internal ws relay 2021-04-11 01:35:53 +08:00
世界
fcbf91cb4a
Migrate to new public proxy list 2021-04-11 01:17:20 +08:00
世界
f7dbc0df85
Fix ws relay on dc4 2021-04-11 01:08:12 +08:00
世界
10decf6b77
Revert alert 2021-04-11 00:43:37 +08:00
世界
09aa41e6d3
Add DC4 alert for ws relay 2021-04-11 00:36:29 +08:00
世界
95c574f012
OSS WebSocket relay implementation 2021-04-11 00:24:54 +08:00
DrKLO
7ba9838a2d Update to 7.6.1 (2274) 2021-04-09 16:17:32 +03:00
世界
1623657bba
Add thanks 2021-04-06 04:16:38 +08:00
世界
e177be18c4
Update v2ray-core 2021-04-06 03:55:48 +08:00
世界
0a14723068
No MT, fork if u want change. 2021-04-06 03:52:34 +08:00