Commit graph

29 commits

Author SHA1 Message Date
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
cc50db9d67 update to 11.1.2 (5240) 2024-09-11 01:38:57 +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
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
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
xaxtix
4a43f809b3 Update to 8.3.1 2021-12-09 19:28:33 +03:00
wrwrabbit
6d9fe4272f
Update AndroidManifest.xml 2021-07-21 19:17:20 +03:00
wrwrabbit
d5d6e434dd
Enable installing beta
Enable installing beta and regular versions on the same device
2021-01-26 20:38:12 +03:00
DrKLO
d52b2c921a Update to 7.3.0 (2195) 2020-12-23 11:48:30 +04:00
DrKLO
2cf2a45aca Update to 5.6.1 2019-05-14 15:08:05 +03:00
DrKLO
ae90d60e0c Update to 5.2.1 2019-01-23 20:03:33 +03:00
DrKLO
d073b80063 Update to 4.9.0 2018-07-30 09:07:02 +07:00
DrKLO
dd679bd7d1 Update to 4.1.1 2017-07-08 19:32:04 +03:00
DrKLO
55463a93db Update to 3.10.1
Thanks to
https://github.com/DrKLO/Telegram/pull/1412
2016-06-24 13:27:15 +03:00
DrKLO
2114024ab1 Update to 3.4.2
Thanks to:
https://github.com/DrKLO/Telegram/pull/1374
https://github.com/DrKLO/Telegram/pull/1383
2016-01-11 20:19:48 +03:00
DrKLO
74def22213 Update to 3.3.1 2015-11-27 00:04:02 +03:00
DrKLO
16af1b0fa7 Fixed release and debug AndroidManifest.xml 2015-09-30 01:46:48 +03:00
DrKLO
0f4b890153 Update to 2.5.2 2015-02-27 22:57:58 +03:00
DrKLO
8233e89daa Perfect forward secrecy in secret chats, phone change, telegram.me links support 2014-12-01 09:56:31 -08:00
DrKLO
8f7652bb7e Bug fixes 2014-08-08 14:17:06 +04:00
DrKLO
d29eabd163 Popup notifications (not finished), removed in-app notifications, DB performance optimisations (fixes for Android L), separate app logic from network logic (not finished)
Note: don’t upload to any markets, it’s may be unstable
2014-07-03 02:39:05 +04:00
DrKLO
69f8bb4f40 Bug fixes, locales update
https://github.com/DrKLO/Telegram/issues/451
2014-06-12 19:53:20 +04:00
DrKLO
f68ace0fd6 Start app on system launch, NotificationsService that will keep app running in background, special connection to receive update only about new messages, option to disable NotificationsService 2014-05-21 00:22:44 +04:00
DrKLO
4ede311055 Update to 1.4.6
Audio notes (opus codec)
A lot of different improvements and bug fixes

Thanks to:
https://github.com/DrKLO/Telegram/issues/293
https://github.com/DrKLO/Telegram/issues/256

FOSS configuration not ready yet

I will move main dev branch to github in next couple commits
2014-03-23 02:31:55 +04:00