lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,905 Commits 7 Branches 194 Tags 1.3 GiB
Commit Graph

180 Commits

Author SHA1 Message Date
世界 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
世界 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
世界 3b285fefb3
Merge remote-tracking branch 'upstream/master' 2020-10-30 19:25:09 +00:00
DrKLO 8726c6d11f Update to 7.2.1 (2135) 2020-10-30 20:44:29 +03: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
世界 2682f3dbfc
Refinds 2020-10-20 15:57:05 +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
世界 9d444fe6ea
Refinds 2020-10-14 15:20:38 +00:00
NekoInverter 52d88f545f
Revert old stuff 
(cherry picked from commit 7ceae539c7c1428b7da67ab562e057c4a08a4847)
 2020-10-09 17:34:25 +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 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
世界 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
世界 3bb2a89c03
Dev setting: disableStatusUpdate 
(cherry picked from commit e4c8827008)
 2020-07-08 03:33:09 +00:00
NekoInverter ddf1841ed1
Bug fixes 2020-06-26 05:40:24 +00:00
世界 dd08362cc6
F & I 2020-06-25 15:28:24 +00:00
世界 9196691935
Icon replaces 2020-06-25 15:12:58 +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 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 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
NekoInverter 7bb2228cc7
Remove FilterPopup 2020-03-27 18:33:03 +08:00
NekoInverter 2343616b51
Long press to mention users by name 2020-02-25 11:40:39 +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
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 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 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 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 c588edf3b6
fix and refactor 2019-10-30 14:29:52 +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 832da08c77
sort accounts 2019-06-19 19:48:50 +08:00
Riko Sakurauchi 311e6c514e
classify chats in archive and bugfix 2019-06-15 18:28:23 +08:00
NekoInverter a5d17f0bf9 add chat filter 2019-06-11 16:40:16 +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 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 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 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 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 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 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 08ac6a14e7 Update to 2.6.1 2015-03-26 20:34:47 +03:00
DrKLO a484ab0d7f Bug fixes 2015-03-19 12:27:46 +03:00
DrKLO 028f5d9c90 Bug fixes, locale update 2015-03-19 04:17:02 +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 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 213c2269c0 Update to 2.3.2 2015-01-09 15:50:15 +03:00
DrKLO 2073ead37e Update to 2.3.0 2015-01-03 01:15:07 +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 95de265e1a Bug fixes 2014-11-24 17:14:40 +03:00