Commit Graph

371 Commits

Author SHA1 Message Date
世界 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 002c01ecd3 Update to 7.2.0 (2134) 2020-10-30 15:41:45 +03:00
DrKLO aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
世界 03b1017a31
Add location request alert 2020-10-22 08:19:22 +00:00
世界 8ac57d1951
Merge remote-tracking branch 'upstream/master' 2020-10-15 01:27:09 +00:00
DrKLO 19599e6ea4 Update to 7.1.3 (2103) 2020-10-15 03:39:36 +03:00
NekoInverter 39e6a4a6bb
Fix no quote forward breaks album 2020-10-09 17:34:20 +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
世界 267a5d821c
Merge remote-tracking branch 'upstream/master' 2020-10-03 03:00:30 +00:00
DrKLO 75d0903666 Update to 7.1.2 (2098) 2020-10-03 00:48:16 +03:00
世界 31a04be16c
Merge remote-tracking branch 'upstream/master' 2020-10-02 13:05:40 +00:00
DrKLO 99f5637dda Update to 7.1.1 (2096) 2020-10-02 14:25:02 +03:00
世界 490f26fc4b
Merge remote-tracking branch 'upstream/master' 2020-10-01 09:01:48 +00:00
DrKLO 4992f231b3 Update to 7.1.1 (2094) 2020-10-01 04:59:32 +03:00
DrKLO 2eeca37bb4 Update to 7.1.0 (2092) 2020-09-30 19:55:35 +03:00
DrKLO 1139e12ef1 Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
世界 8cd55728b1
Merge remote-tracking branch 'upstream/master' 2020-08-22 00:08:39 +00:00
DrKLO e33a2fbedc Update to 7.0.1 (2065) 2020-08-22 02:59:49 +03:00
世界 605b9cee7b
Fix sendWithoutSound 2020-08-20 13:05:42 +00:00
世界 b171bfac02
Merge remote-tracking branch 'upstream/master' 2020-08-16 01:13:38 +00:00
DrKLO 4c5f32babf Update to 7.0.0 (2064) 2020-08-16 00:06:36 +03:00
世界 1421c1a5d7
Merge remote-tracking branch 'upstream/master' 2020-08-15 05:36:15 +00:00
DrKLO 6e495f54b8 Update to 7.0.0 (2061) 2020-08-15 03:01:55 +03:00
DrKLO 321b756367 Update to 7.0.0 (2060) 2020-08-14 19:58:22 +03:00
世界 3b75cb665d Fixes 2020-08-10 10:23:50 +00:00
世界 fcfa7eecc1
Refind profile image 2020-07-29 05:22:30 +00:00
世界 5e8de25641
Merge remote-tracking branch 'upstream/master' 2020-07-27 00:58:40 +00:00
世界 6fad66dc1f
Allow disable vibration 2020-07-26 23:27:40 +00:00
世界 3de0366e62
Add share my public key option 2020-07-26 23:27:39 +00:00
世界 410e2490ca
Add message verify with openkeychain 2020-07-26 23:27:38 +00:00
世界 b1a9d29a1a
Add message sign with openkeychain 2020-07-26 23:27:38 +00:00
世界 f2379ef9f8
Add jalali calendar 2020-07-26 23:27:37 +00:00
DrKLO 320710366d Update to 6.3.0 (2042) 2020-07-27 00:11:01 +03:00
DrKLO 520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +03:00
世界 02a151f3d6
Fixes 2020-07-15 20:55:13 +08:00
世界 2b22dbdb25
Fixes
(cherry picked from commit 7cd71a8c0c)
2020-07-08 03:33:08 +00:00
世界 35dc1a4f2a
Remove web translators & Fixes 2020-06-26 05:43:17 +00:00
NekoInverter ea0e850344
Add copy to url alert
(cherry picked from commit 54d471bd67f36d41790da8e03b2af54aaa3e53cc)
2020-06-26 05:40:24 +00:00
NekoInverter ddf1841ed1
Bug fixes 2020-06-26 05:40:24 +00:00
世界 b0277d41de
Extra futures 2020-06-25 15:29:04 +00:00
世界 8727ccbd79
Proxy 2020-06-25 15:28:55 +00:00
世界 1cec9e7b36
Translates 2020-06-25 15:28:44 +00:00
世界 dd08362cc6
F & I 2020-06-25 15:28:24 +00:00
世界 9196691935
Icon replaces 2020-06-25 15:12:58 +00:00
世界 e046f5090b
Make it NekoX 2020-06-25 13:59:03 +00:00
thermatk 6a3c15a231
[TF][MAPS] replace Google Maps with OSMDroid: ChatAttachAlertLocationLayout
(cherry picked from commit c58ae42234f5681e19d18c5da9d1d9627fa4d1c7)
2020-06-24 14:10:38 +00:00
thermatk f79ff18925
[TF][KILL] Google Vision
(cherry picked from commit 92204aada397a19354ed9212c593b8479be26679)
2020-06-24 13:41:29 +00:00
NekoInverter 1e7c67f3ba
Merge remote-tracking branch 'telegram/master' 2020-06-06 14:10:25 +08:00
DrKLO feba57ced0 Update to 6.2.0 (1988) 2020-06-06 09:07:06 +03:00
NekoInverter a15a4f6961
Merge remote-tracking branch 'telegram/master' 2020-06-05 22:35:30 +08:00
DrKLO f424ea165a Update to 6.2.0 (1986) 2020-06-05 17:08:29 +03:00
NekoInverter 98ee2c2e23
Merge remote-tracking branch 'telegram/master' 2020-06-05 10:44:30 +08:00
DrKLO e2f7baf2bd Update to 6.2.0 (1985) 2020-06-05 05:40:01 +03:00
NekoInverter 13be430274
Revert "Added Color Picker button in Photo Editor."
This reverts commit c3da4abe
2020-06-05 09:14:24 +08:00
NekoInverter 89ccde3c7a
Merge remote-tracking branch 'telegram/master' 2020-06-05 08:04:52 +08:00
DrKLO dceccae0b7 Update to 6.2.0 (1984)
https://github.com/DrKLO/Telegram/pull/1561
2020-06-04 19:47:15 +03:00
NekoInverter 7152ea49e3
Revert some stuff
Revert "Enable obfuscate"

This reverts commit 1ebbd0b2

Revert "Enable Show MKV as video and stream all videos options"

This reverts commit 24b05a98
2020-06-03 19:40:51 +08:00
NekoInverter 48ad7183ab
Fix wrong path in attach alert 2020-06-03 19:40:50 +08:00
NekoInverter 1f4f44c17c
Send stickers from Gboard as stickers 2020-05-17 22:14:46 +08:00
Riko Sakurauchi 902ad01371
Fix and improve no quote forward
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
2020-05-11 08:46:41 +08:00
NekoInverter 503afbf436
Ask before calling 2020-05-07 14:14:40 +08:00
NekoInverter ea9200cc9c
Confirm before sending video/voice message 2020-05-07 13:44:06 +08:00
NekoInverter a8643fdc30
Merge remote-tracking branch 'telegram/master' 2020-05-01 18:31:27 +08:00
DrKLO f120800a7f Update to 6.1.1 (1947) 2020-05-01 13:16:27 +03:00
NekoInverter 4f14264b78
Merge remote-tracking branch 'telegram/master' 2020-05-01 10:22:15 +08:00
DrKLO 5a2a813dc0 Update to 6.1.1 (1946) 2020-05-01 05:08:26 +03:00
NekoInverter 4f4e9d1246
Merge remote-tracking branch 'telegram/master' 2020-05-01 08:46:25 +08:00
DrKLO dbf81a34af Update to 6.1.1 (1945) 2020-04-30 22:07:00 +03:00
NekoInverter b511d66c3c
Merge remote-tracking branch 'telegram/master' 2020-04-24 20:48:41 +08:00
NekoInverter d4aba739d0
Merge remote-tracking branch 'telegram/master' 2020-04-24 20:47:41 +08:00
DrKLO 73e5ba43d6 Update to 6.1.0 (1941) 2020-04-24 13:30:21 +03:00
DrKLO ed9e38da5b Update to 6.1.0 (1940) 2020-04-24 12:28:11 +03:00
DrKLO ae0d24ebf2 Update to 6.1.0 (1938) 2020-04-24 12:21:58 +03:00
NekoInverter cbec0cc444
Fix allow hide "All Chats" 2020-04-18 17:30:35 +08:00
NekoInverter 50e7a6c543
Allow hide "All Chats" 2020-04-18 17:30:34 +08:00
NekoInverter 36925e6282
Added setting to set default camera for Video Messages
close #41
2020-04-18 17:30:33 +08:00
NekoInverter f211fc8450
Enable youtube pip 2020-04-01 18:22:15 +08:00
NekoInverter 33d49afbcf
Merge remote-tracking branch 'telegram/master' 2020-03-31 08:53:50 +08:00
DrKLO 0b83be7356 Update to 6.0.1 (1911) 2020-03-31 00:22:54 +03:00
DrKLO ce5e817fb5 Update to 6.0.1 (1910) 2020-03-30 19:49:17 +03:00
NekoInverter 71a37d1d61
Merge remote-tracking branch 'telegram/master' 2020-03-30 21:25:47 +08:00
DrKLO 80c4acfa3b Update to 6.0.0 (1908) 2020-03-30 15:00:09 +03:00
23rd c3da4abed9
Added Color Picker button in Photo Editor.
- Little changes in color line.
 - Added black color to left side of color line.
2020-02-20 20:23:15 +08:00
NekoInverter 77fae32f94
Merge remote-tracking branch 'telegram/master' 2020-02-16 11:12:24 +08:00
DrKLO df90eface5 Update to 5.15.0 (1869) 2020-02-15 21:17:30 +03:00
NekoInverter 841ceb3174
Merge remote-tracking branch 'telegram/master' 2020-02-15 12:13:01 +08:00
DrKLO dae819b5a3 Update to 5.15.0 (1868) 2020-02-14 20:15:39 +03:00
NekoInverter f6edf0e9fa
Merge remote-tracking branch 'telegram/master' 2020-02-14 11:24:14 +08:00
NekoInverter 84eb8de989
Merge remote-tracking branch 'telegram/master' 2020-02-14 10:42:24 +08:00
DrKLO 08a8e007eb Update to 5.15.0 (1867) 2020-02-14 05:26:25 +03:00
DrKLO 071d511494 Update to 5.15.0 (1866) 2020-02-13 23:45:02 +03:00
DrKLO 2eafc07314 Update to 5.15.0 (1864) 2020-02-13 21:26:53 +03:00
NekoInverter 92380ecfea Copy inline button data 2020-02-08 12:16:34 +08:00
NekoInverter 9dc029ff6a Check on delete for all by default 2020-02-08 11:05:56 +08:00
Riko Sakurauchi 7d2e26c7b5
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-23 21:04:14 +08:00
DrKLO 29aa3efe1e Update to 5.14.0 (1847) 2020-01-23 15:58:50 +03:00
Riko Sakurauchi 1f0732ebc1
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-23 20:13:43 +08:00
DrKLO 30d603778d Update to 5.14.0 (1846) 2020-01-23 09:15:40 +03:00
Riko Sakurauchi 5b66a9f00d
nekogram locale 2020-01-09 01:08:16 +08:00
Riko Sakurauchi 70f9bb86a1
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-09 00:04:58 +08:00
DrKLO dd07a925ee Update to 5.13.1 (1827) 2020-01-05 14:50:11 +03:00
Riko Sakurauchi 240e8138fc
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-04 07:16:50 +08:00
DrKLO 76be9be855 Update to 5.13.1 (1825) 2020-01-04 01:37:09 +03:00
Riko Sakurauchi dcfce27891
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-04 00:14:05 +08:00
DrKLO 44dadb1055 Update to 5.13.1 (1824) 2020-01-03 18:45:22 +03:00
Riko Sakurauchi 107fe3dfbe
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-03 10:04:13 +08:00
DrKLO 12caa1e8cd Update to 5.13.0 (1823) 2020-01-02 18:08:53 +03:00
Riko Sakurauchi bc0f7825b5
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-02 16:28:58 +08:00
DrKLO 4e55e974f8 Update to 5.13.0 (1821) 2020-01-02 01:29:20 +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
Riko Sakurauchi 936a1ca952
fix create mention 2020-01-01 22:58:53 +08:00
Riko Sakurauchi fb177cd090
nav bar and status bar 2020-01-01 22:17:43 +08:00
Riko Sakurauchi 0326c187ad
Merge remote-tracking branch 'telegram/master' 2020-01-01 22:14:58 +08:00
DrKLO cc1dc35742 Update to 5.13.0 (1819) 2019-12-31 22:46:59 +03:00
DrKLO f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +03:00
Riko Sakurauchi e08e7f5ca6
map preview provider 2019-12-17 16:06:28 +08:00
Riko Sakurauchi 1d6a579d9d
Fingerprint unlock title 2019-12-07 14:44:24 +08:00
Riko Sakurauchi b00b9446c4
Merge branch 'master' of github.com:DrKLO/Telegram 2019-09-14 12:26:08 +08:00
DrKLO 28eb8dfd0e Update to 5.11.0 2019-09-10 13:56:11 +03:00
Riko Sakurauchi 9b19ea224e
Merge branch 'master' of github.com:DrKLO/Telegram 2019-08-26 21:42:18 +08:00
DrKLO 53e04b55fb Update to 5.10.0 2019-08-22 01:53:26 +02:00
Riko Sakurauchi 3c4830634f
Merge branch 'master' of github.com:DrKLO/Telegram 2019-07-19 22:22:54 +08:00
DrKLO ff5735503e Update to 5.9.0 2019-07-18 20:01:39 +07:00
Riko Sakurauchi 5e1cccaa48
navbar and status bar 2019-07-07 13:31:28 +08:00
Riko Sakurauchi eb423916c5
nya suffix 2019-06-21 01:05:48 +08:00
Riko Sakurauchi f09d8a39fe
at by id 2019-06-20 21:37:50 +08:00
DrKLO 9ffc7787d6 Update to 5.7.1 2019-06-04 13:14:50 +03:00
DrKLO 2cf2a45aca Update to 5.6.1 2019-05-14 15:08:05 +03:00
DrKLO e397bd9afd Update to 5.4.0 2019-03-03 20:40:48 +00:00
DrKLO f338a88eb4 Update to 5.3.1 2019-02-08 05:30:32 +03:00
DrKLO ae90d60e0c Update to 5.2.1 2019-01-23 20:03:33 +03:00
DrKLO 5972d1d69f Bug fixes 2018-08-27 21:45:56 +03:00
DrKLO fe599cd519 Update to 4.9.1 2018-08-27 11:33:11 +03:00
DrKLO d073b80063 Update to 4.9.0 2018-07-30 09:07:02 +07:00
DrKLO 4ebcbf61cd Update to 4.6.0 2017-12-08 20:35:59 +03:00
DrKLO c92ecf973c Update to 4.2.1 2017-07-24 00:06:13 +03:00
DrKLO 5faa453835 Update locales, bug fixes 2017-07-23 18:27:09 +03:00
DrKLO 56e22d4c59 Update to 4.2.0
source before release? how this even possible?
2017-07-23 15:56:38 +03:00
DrKLO dd679bd7d1 Update to 4.1.1 2017-07-08 19:32:04 +03:00
DrKLO 6a1cf64f6f Update to 3.18.0 2017-03-31 02:58:05 +03:00
DrKLO e313885ac5 Update to 3.13.1 2016-10-11 13:57:01 +02: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 85239ed7cf Update to 3.9.0 2016-05-25 14:49:47 -07:00
DrKLO 1c74ed4587 Bug fixes 2016-04-25 22:26:41 +03:00
DrKLO 06473773a6 Update to 3.8.1 2016-04-22 16:49:00 +03:00
DrKLO a7513b3ba1 Update to 3.7.0 2016-03-16 15:26:32 +03:00
DrKLO 6154c891bd Update to 3.6.1 2016-03-06 02:49:31 +01: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 512e404db7 Update to 3.3.2 2015-12-09 21:27:52 +03:00
DrKLO 74def22213 Update to 3.3.1 2015-11-27 00:04:02 +03:00
DrKLO 496c336d5f Update to 3.2.6 2015-10-29 20:10:07 +03:00
DrKLO 6bb7547f50 Update to 3.2.2 2015-09-24 23:52:02 +03:00
DrKLO 906746d573 Update to 3.1.3 2015-09-02 01:14:21 +03:00
DrKLO 3e90177277 Update to 3.1.2 2015-08-13 12:23:31 +03:00
DrKLO 82f9be238d Update to 3.1.1 2015-07-22 21:56:37 +03:00
DrKLO a93d299484 Update to 3.0.1 2015-06-29 20:12:11 +03:00
DrKLO 4f929ceb4b Missing file 2015-05-22 00:27:47 +03:00
DrKLO 2b81b7f01e update to 2.9.1 2015-05-22 00:27:27 +03:00
DrKLO 2b8304ebf4 Update to 2.8.1
Thanks to https://github.com/DrKLO/Telegram/issues/738 for smart
notifications
2015-05-03 14:48:36 +03:00
DrKLO b820e126d2 update to 2.7.0 2015-04-09 21:00:14 +03:00
DrKLO 1b913b2a2f Bug fixes 2015-03-27 13:32:33 +03:00
DrKLO 08ac6a14e7 Update to 2.6.1 2015-03-26 20:34:47 +03:00
DrKLO 300659e30c Update to 2.6.0
Replies
Mentions
Hashtags
New messages forward logic
Blur in photo editor
2015-03-19 02:09:45 +03:00
DrKLO 0f4b890153 Update to 2.5.2 2015-02-27 22:57:58 +03:00
DrKLO 85bc7046bb Crash fixes 2015-02-26 17:36:15 +03:00
DrKLO 93fa5019c3 Update to 2.5.0
Photo editor
Passcode
Sections in shared media\files
2015-02-26 04:32:51 +03:00
DrKLO dff666fca1 Update to 2.4.0 2015-02-01 21:51:02 +03:00
DrKLO 2073ead37e Update to 2.3.0 2015-01-03 01:15:07 +03:00
DrKLO e5e31e20e4 Bug fixes 2014-12-04 12:27:06 -08:00
DrKLO 8233e89daa Perfect forward secrecy in secret chats, phone change, telegram.me links support 2014-12-01 09:56:31 -08:00