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 |
|
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
|
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
|
521e1a65bf
|
fix cached ptg messages
|
2023-12-28 03:54:01 +03: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
|
b4b2bc2eb7
|
fix PartisanUnsupportedMedia
|
2023-11-07 18:11:05 +03: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
|
755083c01e
|
fix build
|
2023-11-01 23:52:17 +03: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
|
fd59d0397c
|
Merge remote-tracking branch 'upstream/master' into version_3.4.7
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/ui/StatisticActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/Stories/DialogStoriesCell.java
# TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java
# TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/StoryPrivacyBottomSheet.java
# TMessagesProj/src/main/res/values/strings.xml
|
2023-09-23 16:22:30 +03:00 |
|
xaxtix
|
750eedfc96
|
update to 10.1.0 (3919)
|
2023-09-22 18:40:36 +04:00 |
|
wrwrabbit
|
a33a2aed79
|
merge original 10.0.9
|
2023-09-21 11:17:48 +03:00 |
|
xaxtix
|
6b4602c20a
|
update to 10.0.9 (3872)
|
2023-09-16 01:02:29 +04:00 |
|
xaxtix
|
dcad7b4375
|
update to 10.0.8 (3867)
|
2023-09-13 21:27:29 +04:00 |
|
xaxtix
|
36067f8b38
|
update to 10.0.5 (3804)
|
2023-09-06 18:30:04 +04:00 |
|
wrwrabbit
|
3efb419a2e
|
merge original 10.0.1
|
2023-08-18 19:32:29 +03:00 |
|
xaxtix
|
702d37ce69
|
update to 10.0.1 (3793)
|
2023-08-15 02:42:46 +04:00 |
|
wrwrabbit
|
0a1c5be3bf
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
|
2023-08-07 20:38:17 +03:00 |
|
wrwrabbit
|
8804e366fb
|
merge original 9.7.6
|
2023-08-07 20:36:06 +03:00 |
|
xaxtix
|
0bcf4fe556
|
update to 9.7.6 (3721)
|
2023-08-05 11:32:46 +04:00 |
|
wrwrabbit
|
d01ba476f1
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.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/PollVotesAlert.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/ReactedUsersListView.java
# TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/FilteredSearchView.java
# TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
|
2023-07-30 22:43:37 +03:00 |
|
wrwrabbit
|
8a22a207e1
|
merge original 9.7.4
|
2023-07-30 22:36:49 +03:00 |
|
vivabelarus
|
4b3567f047
|
Merge branch 'upstram_master' into 3.4_update
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/ui/NotificationsCustomSettingsActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/StoryPrivacyBottomSheet.java
# TMessagesProj/src/main/res/values/strings.xml
|
2023-07-27 14:09:19 +03:00 |
|
xaxtix
|
6c1e8c1cf7
|
update to 9.7.4 (3712)
|
2023-07-27 12:42:23 +04:00 |
|
vivabelarus
|
ee19d6824b
|
Merge branch 'upstram_master' into 3.4_update
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/messenger/ImageReceiver.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/SendMessagesHelper.java
# TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
# TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
# TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
# TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
# TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.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/ChatActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCreateSpan.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/MediaActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/PollVotesAlert.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/ReactedUsersListView.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/MessageSeenView.java
# TMessagesProj/src/main/java/org/telegram/ui/NotificationsCustomSettingsActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/NotificationsSettingsActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
# TMessagesProj/src/main/res/values/strings.xml
|
2023-07-21 22:09:31 +03:00 |
|
xaxtix
|
65f01a70e7
|
update to 9.7.0 (3687)
|
2023-07-21 00:15:36 +04:00 |
|
wrwrabbit
|
3703670636
|
merge original 9.6.2
|
2023-04-26 21:56:55 +03:00 |
|
vivabelarus
|
317b434740
|
Merge branch 'upstram_master' into 3.3
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/ui/FiltersSetupActivity.java
# TMessagesProj/src/main/res/values/strings.xml
|
2023-04-26 16:09:11 +03:00 |
|
xaxtix
|
3c9a4c1f1f
|
update to 9.6.2
|
2023-04-26 14:01:31 +04:00 |
|
vivabelarus
|
55c555e81f
|
Merge branch 'upstram_master' into 3.3
# Conflicts:
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
# TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java
|
2023-04-25 17:55:26 +03:00 |
|
xaxtix
|
c1e3121db2
|
update to 9.6.1
|
2023-04-25 09:51:03 +04:00 |
|
vivabelarus
|
5f67966320
|
add chat overrides
|
2023-04-23 19:33:51 +03:00 |
|
vivabelarus
|
1eec3ede7c
|
merge original 9.6.0
|
2023-04-21 22:17:38 +03:00 |
|
xaxtix
|
89b0e31753
|
update to 9.6.0
|
2023-04-21 19:06:46 +04:00 |
|
wrwrabbit
|
4c191ba88f
|
merge original 9.5.7
|
2023-04-02 11:59:37 +03:00 |
|