Commit graph

141 commits

Author SHA1 Message Date
vivabelarus
85622b10ab
Merge branch 'upstream_master' into merge/3.7.6
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertAudioLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertDocumentLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-12-06 23:21:21 +03:00
dkaraush
9dcd88b8c1 update to 11.5.3 (5511) 2024-12-06 21:05:26 +04:00
vivabelarus
daf3eaf1e9
Merge branch 'upstream_master'
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stars/StarsIntroActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/bots/BotWebViewSheet.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-11-21 13:28:04 +03:00
dkaraush
fb2e545101 update to 11.4.2 (5469) 2024-11-20 18:15:52 +04:00
vivabelarus
a0766e85be
Merge branch 'refs/heads/upstream_master' into merge/3.7.4
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
#	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/UserConfig.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.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/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stars/StarsIntroActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-10-22 01:30:48 +03:00
dkaraush
9b78d437de update to 11.2.3 (5335) 2024-10-18 00:04:16 +04: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
1e89182699 update to 11.1.3 (5244)
- fixed loading popular bots after cache expiration
- fixed editing caption after weather widget
2024-09-11 02:48:10 +04:00
dkaraush
8558775967 update to 11.1.3 (5243) 2024-09-11 01:59:53 +04:00
dkaraush
cc50db9d67 update to 11.1.2 (5240) 2024-09-11 01:38:57 +04:00
dkaraush
3d718c8d36 update to 11.1.1 (5235) 2024-09-11 01:07:16 +04:00
vivabelarus
e205d28ca1
Merge remote-tracking branch 'refs/remotes/upstream/master' into 3.7.2_merge
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.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/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SenderSelectPopup.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/SelfStoryViewsPage.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/StoryPrivacyBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/bots/BotWebViewSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/web/BotWebViewContainer.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-08-14 22:11:55 +03:00
dkaraush
3409cb1c72 update to 11.0.0 (5143) 2024-08-14 16:33:13 +04:00
vivabelarus
4b23fee34c
Merge remote-tracking branch 'refs/remotes/upstream/master' into 3.7.1
# Conflicts:
#	gradle.properties
2024-07-12 13:15:55 +03:00
dkaraush
5fa5549a4a update to 10.14.5 (4945) 2024-07-11 11:45:28 +04:00
vivabelarus
ea0d76f1d5
Merge remote-tracking branch 'refs/remotes/upstream/master' into merge_10_14
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
2024-07-03 16:07:58 +03:00
dkaraush
a982429401 update to 10.14.3 (4927) 2024-07-03 05:08:00 +04:00
vivabelarus
edd3837311
Merge remote-tracking branch 'refs/remotes/upstream/master' into merge_10_14
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/MediaActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java
#	TMessagesProj/src/main/java/org/telegram/ui/bots/BotWebViewContainer.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-07-01 21:25:48 +03:00
dkaraush
59a0bc1af3 update to 10.14.2 (4911) 2024-06-30 18:27:03 +04:00
vivabelarus
9c02470b59
Merge branch 'upstream_master' into 3.6.5_merge
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.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/Utilities.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertAudioLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertDocumentLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/PaintView.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-06-03 19:47:40 +03:00
dkaraush
5bc1c3dce0 update to 10.13.1 (4845) 2024-06-03 10:21:03 +04:00
vivabelarus
59c4b781bb
Merge branch 'upstream_master' into 3.6.3 2024-05-04 17:55:22 +03:00
dkaraush
d494ea8cb5 update to 10.12.0 (4710) 2024-05-02 20:38:57 +04:00
vivabelarus
4a4e3ea048
Merge branch 'upstream_master' into 3.6.2
# Conflicts:
#	.gitignore
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/BasePermissionsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SearchDownloadsContainer.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/PrivacyControlActivity.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/Stories/DialogStoriesCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/StoryPrivacyBottomSheet.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-04-01 12:51:03 +03:00
dkaraush
a906f12aae update to 10.10.1 (4583) 2024-04-01 11:45:21 +04:00
dkaraush
3a822b15f2 update to 10.10.0 (4571) 2024-03-31 23:10:51 +04:00
vivabelarus
855f4de133
fix build 2024-03-09 05:21:03 +03:00
vivabelarus
1173f3a348
Merge branch 'upstram_master' into 3.6.1 2024-03-09 04:42:09 +03:00
dkaraush
d62d2ed5ec update to 10.9.1 (4464) 2024-03-08 18:32:16 +04:00
vivabelarus
d895eb42d3
Merge branch 'upstram_master' into 3.6.0
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/messenger/ApplicationLoaderImpl.java
2024-02-26 02:05:45 +03:00
dkaraush
4a8efef9d0 update to 10.8.1 (4404) 2024-02-20 12:03:54 +04:00
vivabelarus
a2f161957c
Merge branch 'upstram_master' into 3.6.0
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-02-08 15:42:45 +03:00
dkaraush
5dd649197b update to 10.6.4 (4365) 2024-02-06 20:34:03 +04:00
vivabelarus
02463a182d
Merge branch 'upstram_master' into 3.5.5
# Conflicts:
#	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/MessagesStorage.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PollVotesAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/StatusBadgeComponent.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-01-18 20:58:24 +03:00
dkaraush
928146c3da update to 10.6.1 (4275) 2024-01-18 12:41:46 +04:00
vivabelarus
eb70c0c28a
Merge branch 'upstram_master' into version_3.5.4
# Conflicts:
#	TMessagesProj/src/main/AndroidManifest.xml
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/AppIconsSelectorCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/StatusBadgeComponent.java
#	TMessagesProj/src/main/java/org/telegram/ui/LauncherIconController.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/VoIPFragment.java
#	TMessagesProj/src/main/res/values/strings.xml
2023-12-31 16:27:27 +03:00
dkaraush
a746a072dc update to 10.5.0 (4228) 2023-12-31 16:05:34 +04:00
vivabelarus
ca9f0d20db
Merge branch 'upstram_master' into version_3.5.3
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetService.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/AdminedChannelCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogMeUrlCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCallUserCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCreateUserCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/HintDialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ManageChatUserCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ShareDialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SharingLiveLocationCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/StatisticPostInfoCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatPullingDownDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarsDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/BackButtonMenu.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertContactsLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCallFullscreenAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCallPipAlertView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/MediaActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PhonebookShareAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PollVotesAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/Reactions/ReactionsEffectOverlay.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ScrollSlidingTabStrip.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/GroupCallMiniTextureView.java
#	TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.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/LocationActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/MessageSeenView.java
#	TMessagesProj/src/main/java/org/telegram/ui/MessageStatisticActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/StatisticActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java
#	TMessagesProj/src/main/res/values/strings.xml
2023-12-05 18:19:14 +03:00
dkaraush
33a48d8945 update to 10.3.2 (4145) 2023-12-04 22:17:50 +04:00
vivabelarus
1eed9c5512
Merge remote-tracking branch 'upstream/master' into version_3.5.2
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/BotWebViewSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertBotWebViewLayout.java
2023-11-19 16:39:09 +03:00
dkaraush
220f6b4d73 update to 10.2.9 (4087) 2023-11-15 16:23:35 +04:00
vivabelarus
f02e007adc
Merge branch 'upstram_master' into version_3.5.1
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java
#	TMessagesProj/src/main/res/values/strings.xml
2023-11-08 23:54:41 +03:00
dkaraush
017f019314 update to 10.2.6 (4082) 2023-11-07 23:22:00 +04:00
vivabelarus
959a07d942
Merge branch 'upstram_master' into version_3.5
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
2023-11-02 22:47:36 +03:00
dkaraush
c319639e9a update to 10.2.3 (4075) 2023-11-02 14:51:24 +04:00
vivabelarus
a3f941b4b5
Merge branch 'upstram_master' into version_3.5
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
2023-11-01 13:23:57 +03:00
dkaraush
dfaff8c01d update to 10.2.2 (4071) 2023-10-31 21:13:31 +04:00
vivabelarus
08efe02310
Merge branch 'upstram_master' into version_3.5
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileRefController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.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/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FolderBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java
#	TMessagesProj/src/main/res/values/strings.xml
2023-10-31 13:36:47 +03:00
dkaraush
b4dbcd1639 update to 10.2.0 (4056) 2023-10-29 00:52:06 +04:00
vivabelarus
ae8121fc85
Merge remote-tracking branch 'upstream/master' into version_3.4.7
# Conflicts:
#	Dockerfile
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/res/values/strings.xml
2023-09-25 22:09:24 +03:00