Commit Graph

62 Commits

Author SHA1 Message Date
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
arm64v8a c37dfa2831 Refactor NekoConfig & fixies 2021-10-30 18:22:44 +08:00
arm64v8a da8d2942f0 wip: refactor NekoConfig 2021-10-30 18:22:23 +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
世界 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
世界 b80e566c70
Allow reset data 2020-11-28 15:55:33 +08:00
世界 e5d871e999
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
2020-11-01 01:13:18 +00:00
DrKLO 5a47056c7b Update to 7.2.1 (2139) 2020-11-01 00:13:37 +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 aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
NekoInverter 39e6a4a6bb
Fix no quote forward breaks album 2020-10-09 17:34:20 +00: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
世界 6fad66dc1f
Allow disable vibration 2020-07-26 23:27:40 +00: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 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 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 fe599cd519 Update to 4.9.1 2018-08-27 11:33:11 +03:00
DrKLO d073b80063 Update to 4.9.0 2018-07-30 09:07:02 +07: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
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 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