Commit graph

34 commits

Author SHA1 Message Date
vivabelarus
973af8b71b
fix build 2024-09-11 21:50:33 +03:00
vivabelarus
4c0e1fb85a
Merge remote-tracking branch 'refs/remotes/upstream/master' into merge/3.7.3
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SettingsSuggestionCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/JoinCallByUrlAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SenderSelectPopup.java
#	TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/EditWidgetActivity.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/LogoutActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stars/StarsController.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/StoryPrivacyBottomSheet.java
#	TMessagesProj/src/main/res/values-ar/strings.xml
#	TMessagesProj/src/main/res/values-de/strings.xml
#	TMessagesProj/src/main/res/values-es/strings.xml
#	TMessagesProj/src/main/res/values-it/strings.xml
#	TMessagesProj/src/main/res/values-ko/strings.xml
#	TMessagesProj/src/main/res/values-nl/strings.xml
#	TMessagesProj/src/main/res/values-pt-rBR/strings.xml
#	TMessagesProj/src/main/res/values/strings.xml
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/ui/Components/UpdateLayout.java
#	build.gradle
#	gradle.properties
2024-09-11 11:18:46 +03:00
dkaraush
3d718c8d36 update to 11.1.1 (5235) 2024-09-11 01:07:16 +04:00
vivabelarus
92fb8fc156
fix merge 2023-07-22 22:33:49 +03:00
vivabelarus
e0245cad6e
fix build 2022-08-14 21:02:41 +03:00
wrwrabbit
728f13560f Update from original 8.9.0 2022-08-13 13:52:48 +03:00
xaxtix
b1aa2020e5 update to 8.9.0 2022-08-12 19:23:51 +04:00
vivabelarus
5c75444717
move account actions from FakePasscode to AccountActions 2022-04-23 14:59:09 +03:00
xaxtix
ad6629f6fc Update to 8.4.3 2022-01-10 05:27:47 +03:00
DrKLO
e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03:00
DrKLO
92cfded3fc Update to 7.5.0 (2243) 2021-02-23 18:53:38 +07:00
DrKLO
d52b2c921a Update to 7.3.0 (2195) 2020-12-23 11:48:30 +04:00
DrKLO
aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
DrKLO
520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +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
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
e397bd9afd Update to 5.4.0 2019-03-03 20:40:48 +00:00
DrKLO
fe599cd519 Update to 4.9.1 2018-08-27 11:33:11 +03:00
DrKLO
4ebcbf61cd Update to 4.6.0 2017-12-08 20:35:59 +03: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
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
3e90177277 Update to 3.1.2 2015-08-13 12:23:31 +03:00
DrKLO
a93d299484 Update to 3.0.1 2015-06-29 20:12:11 +03:00
DrKLO
4622ba9186 first commit 2013-10-25 19:19:00 +04:00