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
|
0147b1359d
|
fix build
|
2024-10-22 01:39:21 +03: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
|
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
|
e9047fbbbf
|
add saveLogcatAfterRestart partisan settings
|
2024-06-27 21:04:03 +03:00 |
|
vivabelarus
|
042aaceb85
|
remove parent migration settings from config after migration
|
2024-06-27 20:54:01 +03:00 |
|
vivabelarus
|
d5df198a09
|
hide market icons option in non-standalone builds
|
2024-06-16 23:42:40 +03:00 |
|
vivabelarus
|
33e3164d49
|
update checker refactoring
|
2024-05-25 16:39:02 +03:00 |
|
vivabelarus
|
3fca352787
|
fix build
|
2024-04-01 16:36:45 +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
|
91d70fd981
|
refactoring
|
2024-02-22 21:02:43 +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
|
698352b1c2
|
fix autoremovable messages
|
2024-01-20 01:40:52 +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 |
|
dkaraush
|
a746a072dc
|
update to 10.5.0 (4228)
|
2023-12-31 16:05:34 +04:00 |
|
vivabelarus
|
794b58c85e
|
fix build
|
2023-10-31 14:49:26 +03: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
|
dcad7b4375
|
update to 10.0.8 (3867)
|
2023-09-13 21:27:29 +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 |
|
xaxtix
|
683c4e6dcb
|
update to 9.5.8
|
2023-04-03 17:15:52 +04:00 |
|
vivabelarus
|
b6e6e6a7ab
|
refactoring: move static fake passcode methods to FakePasscodeUtils
|
2023-03-11 15:13:28 +03:00 |
|
wrwrabbit
|
0d20f9b7a9
|
merge original 9.5.0
|
2023-03-08 22:39:20 +03:00 |
|
xaxtix
|
d374d4875d
|
update to 9.5.0
|
2023-03-08 11:27:18 +04:00 |
|
wrwrabbit
|
089970dee7
|
merge original 9.4.1
|
2023-02-05 03:52:33 +03:00 |
|
xaxtix
|
135e3cc766
|
update to 9.4.0
|
2023-02-03 23:11:36 +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
|
1d51e10726
|
fix runNumber
|
2022-11-05 13:27:44 +03:00 |
|
vivabelarus
|
87af5a1aca
|
runNumber: ignore fake runs
|
2022-11-03 18:07:46 +03:00 |
|
vivabelarus
|
dfd6b7d95e
|
fix fake passcode loading
|
2022-11-03 00:35:44 +03:00 |
|
vivabelarus
|
4400390628
|
not show old ptg not removed dialog first 3 runs
|
2022-11-02 15:33:03 +03:00 |
|
vivabelarus
|
7efcbd2656
|
Merge branch 'master' into 3_0_test_new
# Conflicts:
# .github/workflows/alpha.yml
# .github/workflows/beta.yml
# .github/workflows/main.yml
# TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/TesterSettingsActivity.java
|
2022-10-18 18:00:44 +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
|
2b2a8e097f
|
Merge branch 'master' into 3_0_test_new
# Conflicts:
# .github/workflows/alpha.yml
# .github/workflows/beta.yml
# .github/workflows/main.yml
# Dockerfile
# TMessagesProj/build.gradle
# TMessagesProj/src/main/AndroidManifest.xml
# 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/fakepasscode/Update30.java
# TMessagesProj/src/main/java/org/telegram/ui/TesterSettingsActivity.java
|
2022-08-17 23:14:51 +03:00 |
|