TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,702 Commits 20 Branches 263 Tags 1.2 GiB
e58008ef45
Commit Graph

297 Commits

Author SHA1 Message Date
xtaodada
23d2ff5309
Merge remote-tracking branch 'nekox/dev' into dev 2023-04-05 11:47:13 +08:00
luvletter2333
3bc1326792
merge official 9.5.8 2023-04-04 14:24:29 -04:00
xaxtix
683c4e6dcb update to 9.5.8 2023-04-03 17:15:52 +04:00
xaxtix
7e6d40a77a update to 9.5.7 2023-03-30 17:37:45 +04:00
xtaodada
98939180b7
Merge remote-tracking branch 'nekox/dev' into dev 2023-03-28 13:14:41 +08:00
luvletter2333
71b3bb5e01
native: update ffmpeg to 4.4.3 2023-03-28 06:28:13 +08:00
luvletter2333
13d2187bdb
merge: official 9.5.6 2023-03-28 06:11:26 +08:00
luvletter2333
4933c7107b
wip: merge official 9.5.3 2023-03-28 05:12:27 +08:00
xaxtix
5e5b7659cb update to 9.5.5 2023-03-24 15:38:14 +04:00
xaxtix
c06f56dcad update to 9.5.4 2023-03-18 17:33:38 +04:00
xaxtix
07a2c9a330 update to 9.5.3 2023-03-14 02:39:50 +04:00
xaxtix
1dcd153fe2 update to 9.5.2 2023-03-11 00:20:59 +04:00
xaxtix
d374d4875d update to 9.5.0 2023-03-08 11:27:18 +04:00
xaxtix
1ac56c671e update to 9.4.9 2023-02-28 23:33:54 +04:00
xaxtix
116092e32d update to 9.4.6 2023-02-26 06:55:06 +04:00
xaxtix
810bc4ae67 update to 9.4.5 2023-02-25 12:01:39 +04:00
xaxtix
51e9947527 update to 9.4.3 2023-02-19 01:24:25 +04:00
xaxtix
135e3cc766 update to 9.4.0 2023-02-03 23:11:36 +04:00
luvletter2333
69c6fce26b
merge official 9.3.3 2023-01-21 16:25:21 +08:00
xtaodada
81aff5a0ec
Merge remote-tracking branch 'official/master' into dev 2022-12-31 15:55:40 +08:00
xaxtix
3ccf875b1b update to 9.3.0 2022-12-30 16:32:20 +04:00
Next Alone
4196484d20
Merge remote-tracking branch 'Official/master' into dev 
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/src/main/assets/countries.txt
#	TMessagesProj/src/main/java/com/google/zxing/qrcode/QRCodeWriter.java
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLog.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/LocationSharingService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.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/SearchAdapterHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SessionCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedLinkCell.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/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AdminLogFilterAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupInviteActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/PremiumPreviewFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	gradle.properties
 2022-12-11 08:45:08 +08:00
xaxtix
b73fc8de38 update to 9.2.0 2022-12-06 23:13:44 +04:00
Next Alone
2b242c0309
Merge remote-tracking branch 'NekoX/dev' into dev 2022-12-02 18:44:57 +08:00
luvletter2333
b95fa5971d
merge official 9.1.6 2022-12-02 16:57:16 +08:00
luvletter2333
6b59317fa6
merge official 2022-12-02 16:15:42 +08:00
xaxtix
4951061dde update to 9.1.3 2022-11-12 12:41:35 +04:00
xaxtix
342e681114 update to 9.1.1 2022-11-06 05:16:30 +04:00
xaxtix
67b1fd17e6 update to 9.1.0 2022-11-05 16:34:47 +04:00
xtaodada
1019f970f1
Merge remote-tracking branch 'nekox/dev' into dev 2022-10-11 17:44:53 +08:00
luvletter2333
4c8b0b14fa
merge official 2022-10-11 11:07:58 +08:00
xaxtix
11edd5ee0d update to 9.0.1 2022-09-18 21:02:37 +04:00
xaxtix
abb896635f update to 9.0.0 2022-09-16 22:48:21 +04:00
xtaodada
c484830b81
Merge remote-tracking branch 'nekox/dev' into dev 2022-08-18 00:29:30 +08:00
luvletter2333
6c5fae9fae
merge official 8.9.3 
TODO:
1. Fix FCM
2. Fix OSM
3. Add Google Maps into release
 2022-08-17 16:45:51 +08:00
xaxtix
b1aa2020e5 update to 8.9.0 2022-08-12 19:23:51 +04:00
xtaodada
3d63bb2364
feat: Add datacenter status page 
Co-authored-by: NekoInverter <chsqwyx@gmail.com>
 2022-07-29 22:42:05 +08:00
Next Alone
6c9b129c7c
Merge remote-tracking branch 'NekoX/dev' into dev 2022-07-06 21:33:24 +08:00
luvletter2333
0a05e0476b
Merge official v8.8.4 2022-06-30 19:19:47 +08:00
luvletter2333
73cb11f883
Merge official v8.8.3 2022-06-30 19:16:32 +08:00
xaxtix
0a3abc5158 update to 8.8.4 2022-06-28 14:00:33 +04:00
xaxtix
96dce2c9aa Update to 8.8.2 2022-06-21 06:51:00 +04:00
NextAlone
1095a982a7
Merge remote-tracking branch 'NekoX/dev' into dev 
# Conflicts:
#	.github/workflows/debug.yml
#	TMessagesProj/build.gradle
#	TMessagesProj/jni/voip/CMakeLists.txt
#	TMessagesProj/jni/voip/org_telegram_messenger_voip_Instance.cpp
#	TMessagesProj/src/main/java/org/telegram/messenger/DownloadController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
#	TMessagesProj/src/main/java/org/telegram/messenger/video/MediaCodecVideoConvertor.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/Instance.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/CameraScanActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayoutPreview.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatScrimPopupContainerLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatThemeBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/MotionBackgroundDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ReactedUsersListView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/CellFlickerDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.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/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ThemePreviewActivity.java
#	TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
#	TMessagesProj/src/main/res/values-de/strings_nekox.xml
#	TMessagesProj/src/main/res/values-fr/strings_nekox.xml
#	TMessagesProj/src/main/res/values/strings_neko.xml
#	TMessagesProj/src/main/res/values/strings_nekox.xml
 2022-05-09 01:30:03 +08:00
luvletter2333
fa99e892bc
Merge official 8.7.0 2022-05-08 14:59:55 +08:00
luvletter2333
f4a6c1223a
remove unused proxy changes 2022-05-03 01:34:22 +08:00
xaxtix
8283c12364 Update to 8.7.2 2022-04-23 12:51:09 +03:00
xaxtix
8309ac8d7c Update to 8.7.1 2022-04-21 21:03:20 +03:00
xaxtix
1e50785b90 Update to 8.7.0 2022-04-16 17:43:17 +03:00
luvletter2333
b16a3bb372
remove unused proxy changes 2022-04-12 20:28:29 +08:00
xaxtix
0cec276463
chore: merged 8.6.2 2022-03-24 19:25:16 +08:00