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

137 Commits

Author SHA1 Message Date
世界 cd036ed2ca
Merge remote-tracking branch 'upstream/master' 2021-06-26 00:02:05 +08:00
DrKLO dd2b001b95 Update to 7.8.0 (2360) 2021-06-25 15:42:04 +03:00
DrKLO e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03:00
世界 023e6639c4
Merge upstream 7.7.1 (2291) 2021-04-17 08:13:31 +08:00
DrKLO c4ada53b0d Update to 7.7.1 (2291) 2021-04-17 02:59:59 +03:00
世界 aa21a87a10
Merge upstream 7.7.0 (2284) 
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/google-services.json
#	TMessagesProj/jni/TgNetWrapper.cpp
#	TMessagesProj/jni/tgnet/ConnectionsManager.h
#	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/ImageLocation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaController.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/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/WearDataLayerListenerService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/SimpleTextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogMeUrlCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.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/LoginActivity.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
 2021-04-14 10:15:57 +08:00
DrKLO 8bf056e27b Update to 7.7.0 (2284) 2021-04-14 04:44:46 +03: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
世界 7f8ca21868
Refine accounts 2021-03-13 03:51:59 +08:00
世界 04f8f5cf29
Icon improvements 2021-02-08 18:52:13 +08: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
世界 8353c3a0ed
Minor fixes 2021-01-07 18:17:03 +08:00
世界 fbed805f73
Minor fixes 2021-01-01 12:57:37 +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
世界 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
世界 212aac9171
Minor fixes 2020-10-09 17:35:17 +00: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 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
世界 dd08362cc6
F & I 2020-06-25 15:28:24 +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
Riko Sakurauchi a8934169d2
Valentine's Day 2020-02-16 13:08:24 +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 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 bc9865f2f1 Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-28 14:22:20 +08:00
DrKLO 049932d52c Update to 5.14.0 (1850) 2020-01-23 19:54:36 +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 bc0f7825b5
Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-02 16:28:58 +08: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 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 cd8b81ed11
eastern egg and text and icon 2019-12-30 13:43:49 +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 5bc372093d
enable Graphite theme 2019-06-20 19:33:02 +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 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