1
0
mirror of https://github.com/NekoX-Dev/NekoX.git synced 2024-11-11 17:59:28 +01:00
Commit Graph

84 Commits

Author SHA1 Message Date
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
fa5b44b51e
merge official v8.6.1 2022-03-13 22:48:25 +08:00
xaxtix
d30f796d8c Update to 8.6.0 2022-03-11 19:49:54 +03:00
luvletter2333
d54dd02b59 Merge official v8.5.0 2022-02-03 23:02:55 +08:00
xaxtix
ad05eea682 Update to 8.5.0 2022-02-01 16:00:45 +03:00
xaxtix
9e740dfd4d Update to 8.4.1 2021-12-30 13:52:40 +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
世界
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
世界
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
世界
5535ebc0cd
Rewrite LocationActivity changes to osmdroid 2020-11-01 15:57:15 +00:00
DrKLO
8726c6d11f Update to 7.2.1 (2135) 2020-10-30 20:44:29 +03: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
世界
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
世界
9196691935
Icon replaces 2020-06-25 15:12:58 +00:00
thermatk
5999186123
[TF][MAPS] replace Google Maps with OSMDroid: LocationActivity
(cherry picked from commit 1c93d5a569f1bd15408b21fca0f621cdd8addd90)
2020-06-24 14:10:30 +00:00
DrKLO
ed9e38da5b Update to 6.1.0 (1940) 2020-04-24 12:28:11 +03:00
DrKLO
ae0d24ebf2 Update to 6.1.0 (1938) 2020-04-24 12:21:58 +03:00
DrKLO
80c4acfa3b Update to 6.0.0 (1908) 2020-03-30 15:00:09 +03: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
DrKLO
12caa1e8cd Update to 5.13.0 (1823) 2020-01-02 18:08:53 +03:00
DrKLO
4e55e974f8 Update to 5.13.0 (1821) 2020-01-02 01:29:20 +03: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
DrKLO
28eb8dfd0e Update to 5.11.0 2019-09-10 13:56:11 +03:00
DrKLO
ff5735503e Update to 5.9.0 2019-07-18 20:01:39 +07: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
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
6a1cf64f6f Update to 3.18.0 2017-03-31 02:58:05 +03:00
DrKLO
e313885ac5 Update to 3.13.1 2016-10-11 13:57:01 +02:00
DrKLO
55463a93db Update to 3.10.1
Thanks to
https://github.com/DrKLO/Telegram/pull/1412
2016-06-24 13:27:15 +03:00
DrKLO
85239ed7cf Update to 3.9.0 2016-05-25 14:49:47 -07:00
DrKLO
06473773a6 Update to 3.8.1 2016-04-22 16:49:00 +03:00
DrKLO
a7513b3ba1 Update to 3.7.0 2016-03-16 15:26:32 +03:00
DrKLO
6154c891bd Update to 3.6.1 2016-03-06 02:49:31 +01:00
DrKLO
2114024ab1 Update to 3.4.2
Thanks to:
https://github.com/DrKLO/Telegram/pull/1374
https://github.com/DrKLO/Telegram/pull/1383
2016-01-11 20:19:48 +03:00
DrKLO
496c336d5f Update to 3.2.6 2015-10-29 20:10:07 +03:00
DrKLO
6bb7547f50 Update to 3.2.2 2015-09-24 23:52:02 +03:00