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
|
3d718c8d36
|
update to 11.1.1 (5235)
|
2024-09-11 01:07:16 +04:00 |
|
vivabelarus
|
755083c01e
|
fix build
|
2023-11-01 23:52:17 +03: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
|
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
|
6b60b69383
|
merge 9.1.4
|
2022-11-21 12:00:17 +03:00 |
|
xaxtix
|
9bd017a72a
|
update to 9.1.4
|
2022-11-21 01:12:39 +04:00 |
|
vivabelarus
|
c70964b0d4
|
update alpha config
|
2022-11-07 13:13:07 +03:00 |
|
vivabelarus
|
3e7f778ed2
|
add debug keystore
|
2022-10-27 17:58:21 +03:00 |
|
wrwrabbit
|
e59f56848a
|
merge 9.0.2
|
2022-09-21 17:26:10 +03:00 |
|
xaxtix
|
e9a35cea54
|
update to 9.0.2
|
2022-09-21 18:20:30 +04:00 |
|
wrwrabbit
|
387ba976b0
|
merge sync original 9.0.0
|
2022-09-17 03:41:20 +03:00 |
|
xaxtix
|
abb896635f
|
update to 9.0.0
|
2022-09-16 22:48:21 +04:00 |
|
vivabelarus
|
ac9b3b3163
|
fix alpha build
|
2022-08-16 09:50:49 +03:00 |
|
vivabelarus
|
7d0df4180c
|
fix build
|
2022-08-14 21:11:13 +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 |
|