Commit graph

46 commits

Author SHA1 Message Date
vivabelarus
6d18173e07
Merge branch 'merge/masking' into debug/masking 2025-09-07 11:03:09 +03:00
vivabelarus
096594d129
Merge branch 'fixes/4.2.2' into merge/masking
# Conflicts:
#	TMessagesProj/build.gradle
2025-09-07 11:01:51 +03:00
vivabelarus
c843a09435
Merge branch 'upstream_master' into merge/4.2.2
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2025-09-02 20:56:46 +03:00
Arseny271
aa5fe2ee8c update to 12.0.0 (6163) 2025-09-01 19:12:49 +04:00
vivabelarus
4ff9078bfe
Merge branch 'fixes/masking' into debug/masking 2025-08-20 11:59:31 +03:00
vivabelarus
e07bf4ccd4
Merge branch 'fixes/4.2.1' into fixes/masking
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeViewDialog.java
#	TMessagesProj/src/main/java/org/telegram/ui/TesterSettingsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/bots/BotWebViewSheet.java
2025-08-20 11:55:25 +03:00
vivabelarus
2e86c782b6
Merge branch 'upstream_master' into merge/4.2.1
# Conflicts:
#	Dockerfile
#	TMessagesProj/build.gradle
#	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/FlagSecureReason.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/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/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPollLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/PaymentFormActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/PollCreateActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/SecretMediaViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stars/StarsController.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stars/StarsIntroActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
#	gradle/wrapper/gradle-wrapper.properties
2025-08-13 21:48:06 +03:00
Arseny271
c48aeb0317 update 11.13.0 (6047) 2025-07-01 22:52:55 +04:00
vivabelarus
61301e1deb
disable build cache 2025-01-06 14:24:45 +03:00
vivabelarus
3ee6c62d37
prebuild alpha instead of standalone 2024-10-23 16:07:30 +03:00
vivabelarus
cdeeb8c95a
prebuild standalone instead of alpha 2024-10-23 15:19:08 +03:00
vivabelarus
4ab68ee605
offline docker build 2024-10-12 21:35:10 +03:00
vivabelarus
849a75e873
Merge branch 'refs/heads/3.8.0' into masking
# Conflicts:
#	.github/workflows/alpha.yml
#	.github/workflows/beta.yml
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/AndroidManifest.xml
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/partisan/PartisanVersion.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
2024-09-21 22:25:04 +03:00
vivabelarus
de078a63c6
edit Dockerfile 2024-09-15 16:31:46 +03:00
vivabelarus
90247db372
fix docker build 2024-09-12 14:05:26 +03:00
vivabelarus
6793d23e31
fix Dockerfile 2023-09-26 00:21:59 +03: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
xaxtix
fea5ca949a update to 10.1.1 (3926) 2023-09-23 22:46:49 +04:00
wrwrabbit
4584006d1b merge 9.1.5 2022-11-22 13:34:31 +03:00
xaxtix
97ab6c63c8 update to 9.1.5 2022-11-21 20:49:32 +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
vivabelarus
f5cd9051f2
fix build 2022-08-14 23:52:22 +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
vivabelarus
da9ecaa271
change assemble type 2022-07-27 01:53:51 +03:00
xaxtix
4a95c2fc1f Update to 8.8.3 2022-06-23 02:07:45 +04:00
wrwrabbit
8f33cc168c
Update Dockerfile 2022-01-20 16:31:44 +03:00
wrwrabbit
61e062dc8c
Update Dockerfile 2021-12-31 01:15:23 +03:00
wrwrabbit
2474ff9f89
Update Dockerfile 2021-12-30 22:30:09 +03:00
wrwrabbit
0ffd69a0a3
Update Dockerfile 2021-12-11 20:41:35 +03:00
wrwrabbit
d6ea2a6d43
Update Dockerfile 2021-12-11 19:09:32 +03:00
wrwrabbit
685eb23f89
Update Dockerfile 2021-12-11 18:14:50 +03:00
vivabelarus
04bd043dc8
remove assemble standalone 2021-11-24 17:14:33 +03:00
DrKLO
368822d20f Update to 8.0.0 (2406) 2021-08-31 22:06:39 +03:00
DrKLO
7a60f948ae Update to 7.8.2 (2376)
Thanks to @alabiaga and @marcelpinto for help with improvements for Android 12.
https://github.com/DrKLO/Telegram/pull/1633
https://github.com/DrKLO/Telegram/pull/1636
https://github.com/DrKLO/Telegram/pull/1630
2021-07-19 18:56:43 +03:00
DrKLO
e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03:00
DrKLO
8bf056e27b Update to 7.7.0 (2284) 2021-04-14 04:44:46 +03:00
DrKLO
4b588b90aa Update to 7.3.0 (2196) 2020-12-24 09:36:01 +04:00
DrKLO
d52b2c921a Update to 7.3.0 (2195) 2020-12-23 11:48:30 +04:00
DrKLO
aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
DrKLO
e33a2fbedc Update to 7.0.1 (2065) 2020-08-22 02:59:49 +03:00
DrKLO
520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +03:00
DrKLO
dceccae0b7 Update to 6.2.0 (1984)
https://github.com/DrKLO/Telegram/pull/1561
2020-06-04 19:47:15 +03:00
DrKLO
ae0d24ebf2 Update to 6.1.0 (1938) 2020-04-24 12:21:58 +03:00
DrKLO
80c4acfa3b Update to 6.0.0 (1908) 2020-03-30 15:00:09 +03:00
DrKLO
f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +03:00