Commit Graph

71 Commits

Author SHA1 Message Date
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 9969037be2
try to fix status bar 2022-03-27 22:22:33 +08: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
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
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
世界 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
世界 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
世界 5c75f74b1d
Merge upstream 7.5.0 (2244) 2021-02-24 06:10:36 +08:00
DrKLO 92cfded3fc Update to 7.5.0 (2243) 2021-02-23 18:53:38 +07: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
世界 39ff12cca8
Merge upstream 7.3.0 (2197) 2020-12-25 09:45:48 +08:00
DrKLO d333b1f956 Update to 7.3.0 (2197) 2020-12-24 23:58:45 +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 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
世界 e5d964b6a7
Add emoji flavors. close #110 2020-07-08 03:39:59 +00:00
世界 dd08362cc6
F & I 2020-06-25 15:28:24 +00: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 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 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
DrKLO 53e04b55fb Update to 5.10.0 2019-08-22 01:53:26 +02:00
DrKLO ff5735503e Update to 5.9.0 2019-07-18 20:01:39 +07:00
DrKLO 9ffc7787d6 Update to 5.7.1 2019-06-04 13:14:50 +03: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