lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,050 Commits 7 Branches 193 Tags 1.3 GiB
Commit Graph

56 Commits

Author SHA1 Message Date
luvletter2333 4933c7107b
wip: merge official 9.5.3 2023-03-28 05:12:27 +08:00
xaxtix 810bc4ae67 update to 9.4.5 2023-02-25 12:01:39 +04:00
xaxtix 51e9947527 update to 9.4.3 2023-02-19 01:24:25 +04:00
luvletter2333 af9c719d69
sync native with tfoss 2021-10-31 21:09:32 +08:00
luvletter2333 65548549fd
merge official update 8.0.1 2021-09-20 17:14:20 +08:00
xaxtix 42feed0f42 Update to 8.0.1 (2428) 2021-09-20 08:54:41 +03:00
xaxtix 418f478a62 Update to 8.0.1 (2428) 2021-09-20 01:10:42 +03:00
luvletter2333 1cc03ad060 merge upstream v7.9.0 & v7.9.1 2021-08-01 09:31:28 -04:00
DrKLO 3e5d2ba92b Update to 7.9.0 (2384) 2021-07-30 21:49:55 +07:00
世界 cd036ed2ca
Merge remote-tracking branch 'upstream/master' 2021-06-26 00:02:05 +08:00
DrKLO e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03: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
世界 aadfcb7e96
Fix: init ConnectionsManager when calling getInstance 
Signed-off-by: luvletter2333 <luvletter2333@gmail.com>
 2021-03-13 03:52:00 +08:00
世界 510b8d05d9
Merge upstream 7.5.0 (2246) 2021-02-26 10:39:19 +08:00
DrKLO e1c101c334 Update to 7.5.0 (2246) 2021-02-25 19:58:14 +03:00
世界 5efb0b1ad9
Merge upstream 7.5.0 (2245) 2021-02-24 09:46:11 +08:00
DrKLO c44841a55b Update to 7.5.0 (2245) 2021-02-24 08:02:54 +07:00
世界 60e0b895f6
Remove custom server 2021-01-12 10:57:16 +08:00
世界 0072eaaab0
Allow login with qr & Refine its scan 2020-11-28 15:39:40 +08: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
世界 490f26fc4b
Merge remote-tracking branch 'upstream/master' 2020-10-01 09:01:48 +00:00
DrKLO 1139e12ef1 Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
世界 5e8de25641
Merge remote-tracking branch 'upstream/master' 2020-07-27 00:58:40 +00: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
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 84eb8de989
Merge remote-tracking branch 'telegram/master' 2020-02-14 10:42:24 +08: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 0326c187ad
Merge remote-tracking branch 'telegram/master' 2020-01-01 22:14:58 +08:00
DrKLO f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +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 08bee5f454 Merge remote-tracking branch 'fix/fix-clang-libc++-issues' 2019-06-05 12:45:26 +08:00
DrKLO 2cf2a45aca Update to 5.6.1 2019-05-14 15:08:05 +03:00
DrKLO ae90d60e0c Update to 5.2.1 2019-01-23 20:03:33 +03:00
Dan Albert 5d20a2b650 Use <memory> instead of <bits/unique_ptr.h>. 
The latter is gnustl specific.
 2018-10-05 13:33:06 -07:00
DrKLO d073b80063 Update to 4.9.0 2018-07-30 09:07:02 +07:00
DrKLO 4ebcbf61cd Update to 4.6.0 2017-12-08 20:35:59 +03:00
DrKLO dd679bd7d1 Update to 4.1.1 2017-07-08 19:32:04 +03:00
DrKLO 6a1cf64f6f Update to 3.18.0 2017-03-31 02:58:05 +03:00