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
|
8558775967
|
update to 11.1.3 (5243)
|
2024-09-11 01:59:53 +04:00 |
|
dkaraush
|
3d718c8d36
|
update to 11.1.1 (5235)
|
2024-09-11 01:07:16 +04:00 |
|
vivabelarus
|
f5a9460f89
|
show update notification again if "Update Telegram" clicked in a message cell
|
2024-09-08 13:16:27 +03:00 |
|
vivabelarus
|
85caf1208a
|
fix build
|
2024-08-15 01:28:08 +03: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
|
f430d460b4
|
Merge branch 'refs/heads/transfer_data_from_other_ptg' into merge_10_14
|
2024-07-03 18:43:28 +03:00 |
|
vivabelarus
|
e9ada74c4d
|
show migration dialog if apk installed from app
|
2024-07-03 18:33:33 +03: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
|
731b493294
|
apply language during migration
|
2024-06-30 00:32:18 +03:00 |
|
vivabelarus
|
0e5dd03409
|
improve migration receiving
|
2024-06-27 20:44:03 +03:00 |
|
vivabelarus
|
dac7035dfd
|
show connection is disabled dialog after migration
|
2024-06-12 17:04:31 +03:00 |
|
vivabelarus
|
a078ac5e1f
|
fix receiving zip from other ptg
|
2024-06-09 20:59:40 +03:00 |
|
vivabelarus
|
9fb11f80fa
|
Merge branch '3.6.5_merge' into transfer_data_from_other_ptg
|
2024-06-04 16:38:45 +03: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
|
33e3164d49
|
update checker refactoring
|
2024-05-25 16:39:02 +03: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
|
0003c0df51
|
Merge branch '3.6.3' into transfer_data_from_other_ptg
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/partisan/Utils.java
# TMessagesProj/src/main/res/values/strings.xml
|
2024-04-26 21:42:20 +03: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
|
735b77ae77
|
show can't change phone number alert
|
2024-03-11 03:46:17 +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 |
|
vivabelarus
|
972fa0a737
|
add partisan links
|
2024-02-21 20:58:31 +03:00 |
|
dkaraush
|
4a8efef9d0
|
update to 10.8.1 (4404)
|
2024-02-20 12:03:54 +04:00 |
|
vivabelarus
|
1eb96ab02a
|
restore some from 3.0 update
|
2024-02-11 14:57:42 +03:00 |
|
vivabelarus
|
9b38a2cf01
|
fix build
|
2024-02-08 17:11:32 +03: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 |
|
vivabelarus
|
98b636578c
|
refactoring
|
2024-02-08 12:34:47 +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
|
b448d426de
|
fix copy-paste
|
2024-01-12 23:47:15 +03:00 |
|
vivabelarus
|
47c17e96f7
|
fix remove after read messages
|
2024-01-02 19:27:10 +03:00 |
|
vivabelarus
|
3f386f90d0
|
fix autodeletable messages
|
2024-01-02 01:45:22 +03: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 |
|