Commit Graph

27 Commits

Author SHA1 Message Date
luvletter2333 0a05e0476b
Merge official v8.8.4 2022-06-30 19:19:47 +08:00
luvletter2333 73cb11f883
Merge official v8.8.3 2022-06-30 19:16:32 +08:00
xaxtix 0a3abc5158 update to 8.8.4 2022-06-28 14:00:33 +04:00
xaxtix 96dce2c9aa Update to 8.8.2 2022-06-21 06:51:00 +04: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
世界 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
世界 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
DrKLO 7ba9838a2d Update to 7.6.1 (2274) 2021-04-09 16:17:32 +03: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
世界 a7110adb4c
Fix photo list
Update boringssl, libwebp
2020-10-31 14:25:23 +00:00
世界 3b75cb665d Fixes 2020-08-10 10:23:50 +00:00
世界 fcfa7eecc1
Refind profile image 2020-07-29 05:22:30 +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
DrKLO dceccae0b7 Update to 6.2.0 (1984)
https://github.com/DrKLO/Telegram/pull/1561
2020-06-04 19:47:15 +03:00
DrKLO 80c4acfa3b Update to 6.0.0 (1908) 2020-03-30 15:00:09 +03:00
DrKLO 2eafc07314 Update to 5.15.0 (1864) 2020-02-13 21:26:53 +03:00
DrKLO 30d603778d Update to 5.14.0 (1846) 2020-01-23 09:15:40 +03:00
DrKLO f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +03:00