|
|
091498c6a3
|
Merge remote-tracking branch 'official/master' into dev
|
2024-07-01 11:21:14 +08:00 |
|
dkaraush
|
59a0bc1af3
|
update to 10.14.2 (4911)
|
2024-06-30 18:27:03 +04:00 |
|
|
|
c8b8d83728
|
Merge remote-tracking branch 'official/master' into dev
|
2024-06-03 19:41:11 +08:00 |
|
dkaraush
|
5bc1c3dce0
|
update to 10.13.1 (4845)
|
2024-06-03 10:21:03 +04:00 |
|
|
|
be319b8960
|
Merge remote-tracking branch 'official/master' into dev
|
2024-04-01 22:38:47 +08:00 |
|
dkaraush
|
3a822b15f2
|
update to 10.10.0 (4571)
|
2024-03-31 23:10:51 +04:00 |
|
|
|
9415a2bd94
|
fix: build 10.9.1
|
2024-03-09 21:24:08 +08:00 |
|
|
|
0549d806b4
|
Merge remote-tracking branch 'official/master' into dev
|
2024-03-09 12:21:44 +08:00 |
|
dkaraush
|
d62d2ed5ec
|
update to 10.9.1 (4464)
|
2024-03-08 18:32:16 +04:00 |
|
|
|
16831b5529
|
Merge remote-tracking branch 'official/master' into dev
|
2023-10-29 13:45:16 +08:00 |
|
dkaraush
|
b4dbcd1639
|
update to 10.2.0 (4056)
|
2023-10-29 00:52:06 +04:00 |
|
|
|
7ee7c6eb41
|
Merge remote-tracking branch 'official/master' into dev
|
2023-09-14 15:07:47 +08:00 |
|
xaxtix
|
dcad7b4375
|
update to 10.0.8 (3867)
|
2023-09-13 21:27:29 +04:00 |
|
|
|
3facd9f882
|
fix: merge 9.7.6
|
2023-08-11 22:10:29 +08:00 |
|
|
|
1d357ca0c5
|
Merge remote-tracking branch 'telegram/master' into dev
|
2023-08-11 17:27:20 +08:00 |
|
xaxtix
|
65f01a70e7
|
update to 9.7.0 (3687)
|
2023-07-21 00:15:36 +04:00 |
|
xaxtix
|
7c62a5da96
|
update to 9.6.5 (3356)
|
2023-05-04 16:25:48 +04:00 |
|
luvletter2333
|
13d2187bdb
|
merge: official 9.5.6
|
2023-03-28 06:11:26 +08:00 |
|
luvletter2333
|
4933c7107b
|
wip: merge official 9.5.3
|
2023-03-28 05:12:27 +08:00 |
|
xaxtix
|
5e5b7659cb
|
update to 9.5.5
|
2023-03-24 15:38:14 +04:00 |
|
xaxtix
|
51e9947527
|
update to 9.4.3
|
2023-02-19 01:24:25 +04:00 |
|
luvletter2333
|
6b59317fa6
|
merge official
|
2022-12-02 16:15:42 +08:00 |
|
xaxtix
|
342e681114
|
update to 9.1.1
|
2022-11-06 05:16:30 +04:00 |
|
luvletter2333
|
65548549fd
|
merge official update 8.0.1
|
2021-09-20 17:14:20 +08:00 |
|
xaxtix
|
42feed0f42
|
Update to 8.0.1 (2428)
|
2021-09-20 08:54:41 +03:00 |
|
xaxtix
|
418f478a62
|
Update to 8.0.1 (2428)
|
2021-09-20 01:10:42 +03:00 |
|
luvletter2333
|
1cc03ad060
|
merge upstream v7.9.0 & v7.9.1
|
2021-08-01 09:31:28 -04:00 |
|
DrKLO
|
3e5d2ba92b
|
Update to 7.9.0 (2384)
|
2021-07-30 21:49:55 +07:00 |
|
世界
|
aa21a87a10
|
Merge upstream 7.7.0 (2284)
# Conflicts:
# TMessagesProj/build.gradle
# TMessagesProj/google-services.json
# TMessagesProj/jni/TgNetWrapper.cpp
# TMessagesProj/jni/tgnet/ConnectionsManager.h
# TMessagesProj/src/main/AndroidManifest.xml
# TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/messenger/ImageLocation.java
# TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
# 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/SendMessagesHelper.java
# TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
# TMessagesProj/src/main/java/org/telegram/messenger/WearDataLayerListenerService.java
# TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
# TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
# TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
# TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
# TMessagesProj/src/main/java/org/telegram/ui/ActionBar/SimpleTextView.java
# TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
# TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java
# TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogMeUrlCell.java
# TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
# TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
# TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.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/LoginActivity.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/ProfileActivity.java
|
2021-04-14 10:15:57 +08:00 |
|
DrKLO
|
8bf056e27b
|
Update to 7.7.0 (2284)
|
2021-04-14 04:44:46 +03:00 |
|
世界
|
be7a415a03
|
Merge upstream 7.6.0 (2264)
|
2021-03-19 19:42:32 +08:00 |
|
DrKLO
|
ca13bc972d
|
Update to 7.6.0 (2264)
|
2021-03-19 13:25:58 +03:00 |
|
世界
|
b30bc1ed80
|
Unlimited accounts
|
2021-03-13 03:52:00 +08:00 |
|
世界
|
5efb0b1ad9
|
Merge upstream 7.5.0 (2245)
|
2021-02-24 09:46:11 +08:00 |
|
DrKLO
|
c44841a55b
|
Update to 7.5.0 (2245)
|
2021-02-24 08:02:54 +07:00 |
|
世界
|
60e0b895f6
|
Remove custom server
|
2021-01-12 10:57:16 +08:00 |
|
世界
|
0072eaaab0
|
Allow login with qr & Refine its scan
|
2020-11-28 15:39:40 +08:00 |
|
世界
|
58edbe46fd
|
Don't alert "Proxy unavailable" for non-current account.
|
2020-11-04 14:08:20 +00:00 |
|
世界
|
767c9897af
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# TMessagesProj/build.gradle
# TMessagesProj/src/main/AndroidManifest.xml
# TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
# TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
# TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
# TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java
# 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/SendMessagesHelper.java
# TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
# TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
# TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
# TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java
# TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
# TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
# TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.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/Bulletin.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
# TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
# TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
# TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.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/ProfileActivity.java
# build.gradle
# gradle/wrapper/gradle-wrapper.properties
|
2020-10-30 14:57:47 +00:00 |
|
DrKLO
|
aaa5dc0328
|
Update to 7.2.0 (2128)
|
2020-10-30 13:26:29 +03:00 |
|
世界
|
490f26fc4b
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-01 09:01:48 +00:00 |
|
DrKLO
|
1139e12ef1
|
Update to 7.1.0 (2090)
|
2020-09-30 16:48:47 +03:00 |
|
世界
|
5e8de25641
|
Merge remote-tracking branch 'upstream/master'
|
2020-07-27 00:58:40 +00:00 |
|
DrKLO
|
520592b43d
|
Update to 6.3.0 (2040)
|
2020-07-26 11:03:38 +03:00 |
|
世界
|
5eb5f9de51
|
Native changes
|
2020-06-25 14:02:59 +00:00 |
|
DrKLO
|
ae0d24ebf2
|
Update to 6.1.0 (1938)
|
2020-04-24 12:21:58 +03:00 |
|
DrKLO
|
1eea3ab6f7
|
Update to 5.13.0 (1820)
Merged some parts of https://github.com/DrKLO/Telegram/pull/1541
|
2020-01-01 21:32:12 +03:00 |
|
DrKLO
|
f41b228a11
|
Update to 5.13.0 (1818)
|
2019-12-31 16:08:08 +03:00 |
|
DrKLO
|
53e04b55fb
|
Update to 5.10.0
|
2019-08-22 01:53:26 +02:00 |
|
DrKLO
|
ff5735503e
|
Update to 5.9.0
|
2019-07-18 20:01:39 +07:00 |
|
