Commit Graph

103 Commits

Author SHA1 Message Date
世界 165d6ceeff
Update README 2021-04-03 09:20:02 +08: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
世界 5c75f74b1d
Merge upstream 7.5.0 (2244) 2021-02-24 06:10:36 +08:00
DrKLO 31b580133f Update to 7.5.0 (2244) 2021-02-24 03:15:13 +07:00
DrKLO 92cfded3fc Update to 7.5.0 (2243) 2021-02-23 18:53:38 +07:00
世界 e954b7fd2e
Fix some crash in provider 2021-02-13 11:34:40 +08:00
世界 75eff5aa7f
QR related improves 2021-02-03 23:04:16 +08:00
世界 db70486fae
Merge upstream 7.4.2 2021-01-30 14:43:38 +08:00
DrKLO eb2bbd32c1 Update to 7.4.2 (2226) 2021-01-30 09:18:23 +03:00
世界 c7f786a112
Merge upstream 7.4.0 (2223) 2021-01-29 01:03:44 +08:00
DrKLO 77bbe5baec Update to 7.4.0 (2221) 2021-01-28 17:15:51 +03:00
世界 08588cf6d3
Rewrite tablet mode selector 2021-01-11 19:24:27 +08:00
世界 b34f56582b
Merge upstream 7.3.1 (2199) 2020-12-26 13:36:11 +08:00
DrKLO d0e2266da1 Update to 7.3.1 (2199) 2020-12-26 09:18:43 +04:00
世界 dce4798c4c
Migrate to new storage setting 2020-12-23 20:31:26 +08: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
世界 6104389aab
Revert old stuff 2020-12-17 13:45:19 +08:00
世界 66e5306bbe
Fix link 2020-12-17 11:33:12 +08: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 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
世界 886ceeb49f
Add trojan proxy support by v2ray 2020-10-20 16:24:13 +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
世界 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
世界 490f26fc4b
Merge remote-tracking branch 'upstream/master' 2020-10-01 09:01:48 +00: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
世界 1421c1a5d7
Merge remote-tracking branch 'upstream/master' 2020-08-15 05:36:15 +00:00
DrKLO 321b756367 Update to 7.0.0 (2060) 2020-08-14 19:58:22 +03:00
世界 ee5d3fa381 Remove relaybaton due to esni is blocked in China 2020-08-10 10:23:50 +00:00
世界 3b75cb665d Fixes 2020-08-10 10:23:50 +00:00
世界 5e8de25641
Merge remote-tracking branch 'upstream/master' 2020-07-27 00:58:40 +00:00
世界 f2379ef9f8
Add jalali calendar 2020-07-26 23:27:37 +00:00
DrKLO 520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +03:00
世界 8727ccbd79
Proxy 2020-06-25 15:28:55 +00:00
thermatk 5999186123
[TF][MAPS] replace Google Maps with OSMDroid: LocationActivity
(cherry picked from commit 1c93d5a569f1bd15408b21fca0f621cdd8addd90)
2020-06-24 14:10:30 +00:00
thermatk 4e7cb4365f
[TF][KILL] remaining GMS(GCM, Wear, etc), except for Maps
(cherry picked from commit 337ab9e8e8aa966281716e6af164882184bf80c7)
2020-06-24 13:47:42 +00:00
thermatk ec6a123f2f
[TF][KILL] Hockey analytics
(cherry picked from commit af24d61e151b0656b940838f736037686f212e98)
2020-06-24 13:41:28 +00: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 76cb9ac206
Re-organize neko settings 2020-06-03 19:40:48 +08: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 d4aba739d0
Merge remote-tracking branch 'telegram/master' 2020-04-24 20:47:41 +08:00