Commit Graph

127 Commits

Author SHA1 Message Date
世界
5c75f74b1d
Merge upstream 7.5.0 (2244) 2021-02-24 06:10:36 +08:00
DrKLO
92cfded3fc Update to 7.5.0 (2243) 2021-02-23 18:53:38 +07: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
NekoInverter
2699e46c96
Update some icons 2021-01-08 16:54: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
世界
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
世界
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
世界
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
世界
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
世界
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
世界
e046f5090b
Make it NekoX 2020-06-25 13:59:03 +00: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
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
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
d4aba739d0
Merge remote-tracking branch 'telegram/master' 2020-04-24 20:47:41 +08:00
DrKLO
ae0d24ebf2 Update to 6.1.0 (1938) 2020-04-24 12:21:58 +03:00
NekoInverter
33d49afbcf
Merge remote-tracking branch 'telegram/master' 2020-03-31 08:53:50 +08: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
84eb8de989
Merge remote-tracking branch 'telegram/master' 2020-02-14 10:42:24 +08:00
DrKLO
2eafc07314 Update to 5.15.0 (1864) 2020-02-13 21:26:53 +03:00
NekoInverter
29ecc5ffd7 message translate 2020-01-29 17:15:34 +08: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
0326c187ad
Merge remote-tracking branch 'telegram/master' 2020-01-01 22:14:58 +08:00
DrKLO
f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +03:00
Riko Sakurauchi
cd8b81ed11
eastern egg and text and icon 2019-12-30 13:43:49 +08:00
Riko Sakurauchi
92c7d0a51b
Update icon and language pack 2019-12-09 10:44:11 +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
4019b736c1
resize notification icon 2019-08-05 22:19:15 +08: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
e6c3a4bb60
update notification icon 2019-07-14 09:34:51 +08:00
Riko Sakurauchi
2bf25c501e
change icons 2019-06-25 18:08:56 +08:00