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

202 Commits

Author SHA1 Message Date
luvletter2333 b0f64e4eb1
feat: Hide time for stickers 2021-07-16 14:10:34 +08:00
luvletter2333 17dd08d9ba
merge official v7.8.1 2021-07-16 14:10:08 +08:00
DrKLO 3ac3c37dd2 Update to 7.8.1 2021-07-15 17:24:57 +03:00
世界 cd036ed2ca
Merge remote-tracking branch 'upstream/master' 2021-06-26 00:02:05 +08:00
DrKLO e8d88e56e4 Update to 7.8.0 (2359) 2021-06-25 03:43:10 +03:00
luvletter2333 b47d649861
Fix NPE for 793fd0d5 2021-05-05 22:17:32 +08:00
luvletter2333 8154cf501b
Fix emoji display in link Title 2021-05-05 20:22:48 +08:00
luvletter2333 793fd0d51f
do not ignoreBlocked in Recent Actions 2021-05-05 19:22:33 +08:00
luvletter2333 854b68a3c1
Fix emoji display in signed channel message 2021-05-02 00:17:03 +08:00
世界 e45913c40b
Fix missing side button 2021-04-17 23:56:37 +08: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
世界 865e4b9b9a
Option to hide message 2021-04-13 12:51:17 +08:00
DrKLO 7ba9838a2d Update to 7.6.1 (2274) 2021-04-09 16:17:32 +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
tehcneko 368ab7ab8b
Allow opening large (> 512px) stickers in media viewer 
(cherry picked from commit 014b6a28bcec8255ae5ffde9da8fcf86e5695bb4)
 2021-03-05 13:16:56 +08:00
世界 5efb0b1ad9
Merge upstream 7.5.0 (2245) 2021-02-24 09:46:11 +08:00
DrKLO c44841a55b Update to 7.5.0 (2245) 2021-02-24 08:02:54 +07: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
世界 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
世界 92c74bbc21
Parse emoji in names 2021-01-28 15:27:16 +08:00
世界 932b17b1b2
Merge upstream 7.3.1 (2206) 2021-01-01 23:30:19 +08:00
DrKLO d52de1a40a Update to 7.3.1 (2206) 2021-01-01 08:38:45 +04: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
世界 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
世界 e5d871e999
Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
 2020-11-01 01:13:18 +00:00
DrKLO 5a47056c7b Update to 7.2.1 (2139) 2020-11-01 00:13:37 +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
世界 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
世界 3251959c47
Minor fixes 2020-10-04 16:15:23 +00: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
世界 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
世界 6fad66dc1f
Allow disable vibration 2020-07-26 23:27:40 +00:00
DrKLO 520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +03:00
NekoInverter ddf1841ed1
Bug fixes 2020-06-26 05:40:24 +00:00
世界 1cec9e7b36
Translates 2020-06-25 15:28:44 +00: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 025b0d3db7
Fix sticker size preview 2020-06-05 09:40:53 +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 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 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 31072e7095
Fix crash 2020-03-07 15:45:34 +08:00
Riko Sakurauchi 66a6ac68af
Improve button copy 2020-02-16 13:47:23 +08: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 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 bc9865f2f1 Merge branch 'master' of github.com:DrKLO/Telegram 2020-01-28 14:22:20 +08:00
DrKLO 7d6fa267c1 Update to 5.14.0 (1851) 2020-01-23 20:55:45 +03: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 6054710c53
sticker size 2020-01-17 00:10:29 +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 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 e08e7f5ca6
map preview provider 2019-12-17 16:06:28 +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