Commit Graph

51 Commits

Author SHA1 Message Date
1ef369412b
Merge remote-tracking branch 'official/master' into dev 2023-11-01 13:56:06 +08:00
dkaraush
dfaff8c01d update to 10.2.2 (4071) 2023-10-31 21:13:31 +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
1d357ca0c5
Merge remote-tracking branch 'telegram/master' into dev 2023-08-11 17:27:20 +08:00
xaxtix
89b0e31753 update to 9.6.0 2023-04-21 19:06:46 +04:00
23d2ff5309
Merge remote-tracking branch 'nekox/dev' into dev 2023-04-05 11:47:13 +08:00
luvletter2333
3bc1326792
merge official 9.5.8 2023-04-04 14:24:29 -04:00
xaxtix
683c4e6dcb update to 9.5.8 2023-04-03 17:15:52 +04:00
98939180b7
Merge remote-tracking branch 'nekox/dev' into dev 2023-03-28 13:14:41 +08:00
luvletter2333
4933c7107b
wip: merge official 9.5.3 2023-03-28 05:12:27 +08:00
xaxtix
810bc4ae67 update to 9.4.5 2023-02-25 12:01:39 +04:00
xaxtix
51e9947527 update to 9.4.3 2023-02-19 01:24:25 +04:00
NextAlone
22aa6abe7c
fix: lib webp 2022-03-23 01:09:22 +08:00
luvletter2333
fa5b44b51e
merge official v8.6.1 2022-03-13 22:48:25 +08:00
xaxtix
5d5527525f Update to 8.6.1 2022-03-13 04:58:00 +03:00
luvletter2333
ba9f84efee Fix release CI 2022-02-04 22:09:14 +08:00
luvletter2333
672c7e8688 Fix libvpx x86 build 2022-02-04 15:44:02 +08:00
luvletter2333
db1ba95ae5 Fix libvpx builds 2022-02-04 00:45:34 +08:00
luvletter2333
d4e8d513c4 Update native build scripts from tfoss 2022-02-03 23:25:39 +08:00
luvletter2333
d54dd02b59 Merge official v8.5.0 2022-02-03 23:02:55 +08:00
xaxtix
ad05eea682 Update to 8.5.0 2022-02-01 16:00:45 +03:00
luvletter2333
65f7479c7c
Add libvpx build for x86 and x86_64 2021-12-24 00:17:48 +08:00
luvletter2333
fb0a01b4d1
upgrade AGP to 7.0.3 and fix builds 2021-11-17 20:18:05 +08:00
luvletter2333
af9c719d69
sync native with tfoss 2021-10-31 21:09:32 +08: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
luvletter2333
17dd08d9ba
merge official v7.8.1 2021-07-16 14:10:08 +08:00
DrKLO
3ac3c37dd2 Update to 7.8.1 2021-07-15 17:24:57 +03:00
世界
cd036ed2ca
Merge remote-tracking branch 'upstream/master' 2021-06-26 00:02:05 +08:00
DrKLO
e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03: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
世界
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
世界
1bfe2dc0d7
Merge remote-tracking branch 'upstream/master' 2020-12-23 17:13:40 +08:00
DrKLO
d52b2c921a Update to 7.3.0 (2195) 2020-12-23 11:48:30 +04: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
世界
cc1209b617
Refinds 2020-10-13 14:53:22 +00:00
世界
e7deda98a5
Merge remote-tracking branch 'upstream/master' 2020-10-05 01:53:04 +00:00
DrKLO
d3ad1316c4 Update to 7.1.3 (2100) 2020-10-05 01:13:31 +03:00
世界
244a082e96
Migrate to CMake 2020-10-04 10:41:56 +00:00