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

87 Commits

Author SHA1 Message Date
luvletter2333 4c8b0b14fa
merge official 2022-10-11 11:07:58 +08:00
xaxtix abb896635f update to 9.0.0 2022-09-16 22:48:21 +04:00
luvletter2333 73cb11f883
Merge official v8.8.3 2022-06-30 19:16:32 +08:00
xaxtix 96dce2c9aa Update to 8.8.2 2022-06-21 06:51:00 +04:00
luvletter2333 fa99e892bc
Merge official 8.7.0 2022-05-08 14:59:55 +08:00
xaxtix 8309ac8d7c Update to 8.7.1 2022-04-21 21:03:20 +03:00
xaxtix 1e50785b90 Update to 8.7.0 2022-04-16 17:43:17 +03:00
luvletter2333 a6c39637da
merge official 8.6.2 2022-03-24 13:58:27 +08:00
xaxtix 0abe4541dd Update to 8.6.2 2022-03-20 23:22:37 +03:00
luvletter2333 7474cd9718
Merge official 8.4.1 & 8.4.2 2022-01-01 02:10:02 +08:00
xaxtix 9e740dfd4d Update to 8.4.1 2021-12-30 13:52:40 +03:00
xaxtix 4a43f809b3 Update to 8.3.1 2021-12-09 19:28:33 +03:00
luvletter2333 d938d7ff9b
Merge official 8.3.0 2021-12-08 20:33:55 +08:00
xaxtix 64c32ace43 Update to 8.3.0 2021-12-07 16:02:02 +03:00
arm64v8a e1098169b6 Merge remote-tracking branch 'tg/master' into dev 2021-11-05 22:11:49 +08:00
xaxtix 1d379b9a7b Update to 8.2.1 (2462) 2021-11-05 13:06:49 +03: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 24c6968b8a Update to 7.9.1 (2387) 2021-07-31 06:39:13 +07: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
世界 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
世界 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
世界 352eafcb9e
Fix item 2021-03-24 14:19:35 +08:00
世界 be7a415a03
Merge upstream 7.6.0 (2264) 2021-03-19 19:42:32 +08:00
DrKLO ca13bc972d Update to 7.6.0 (2264) 2021-03-19 13:25:58 +03: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
世界 f7576131b2
Fixes 2021-01-11 16:20:08 +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
世界 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 002c01ecd3 Update to 7.2.0 (2134) 2020-10-30 15:41:45 +03:00
DrKLO aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03: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
世界 31a04be16c
Merge remote-tracking branch 'upstream/master' 2020-10-02 13:05:40 +00:00
DrKLO 99f5637dda Update to 7.1.1 (2096) 2020-10-02 14:25:02 +03:00
世界 490f26fc4b
Merge remote-tracking branch 'upstream/master' 2020-10-01 09:01:48 +00:00
DrKLO 2eeca37bb4 Update to 7.1.0 (2092) 2020-09-30 19:55:35 +03: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