mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
17210 commits 7 branches 124 tags 230 MiB
Commit graph

17210 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
cf3036de22 Automatic upstream merge postprocessing 
Change-Id: Ia795352ccd15a5c17d71090d221cbedb51a96874
 2022-05-05 17:41:28 +02:00
SpiritCroc
4617d2d698 Merge tag 'v1.4.14' into sc 
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2022-05-05 17:41:26 +02:00
Michael Kaye
fb19d6b83c Try ensuring public_baseurl set correctly. 2022-05-05 14:35:54 +01:00
Benoit Marty
8e319067ad Add diag request for Synapse 2022-05-05 15:34:23 +02:00
Benoit Marty
7a01e1bf65 Add small step at the beginning of the release flow 2022-05-05 14:55:34 +02:00
SpiritCroc
11194546a7 [TMP] Automatic upstream merge preparation 
Change-Id: I3d17203abc4c7c8b681ba3d23483f76d3b5c2caa
 2022-05-05 14:26:49 +02:00
SpiritCroc
2a87ebe3e8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iceff48cf6d67ca6e84bc04e9a5d94d81cb339932
 2022-05-05 14:26:49 +02:00
ClaireG
c9bd1f32b9
Update notifications rules: make a sound for each notification 2022-05-05 14:02:11 +02:00
SpiritCroc
92fe0a5a29 Rageshake: re-enable can_contact switch 
Follow-ups may be useful for some kind of reports

Change-Id: Id2a42ce771f1ed355b896e5e8f8ad61e61670d8b
 2022-05-05 13:28:26 +02:00
SpiritCroc
3e2fdd0784 Inline images: use isMxcUrl() 
Change-Id: Ie85c5597e714b48dc5bcd3ac69abb5161b4fa640
 2022-05-05 13:28:12 +02:00
Onuray Sahin
b486559469 Update video mute status after stopping screen sharing. 2022-05-05 14:15:17 +03:00
Onuray Sahin
754208e164 Don't enable video after stopping screen sharing for audio calls. 2022-05-05 14:02:19 +03:00
Benoit Marty
0b30c28fe4 Opposite if for better code clarity 2022-05-05 12:15:10 +02:00
Benoit Marty
ced4146350 Changelog 2022-05-05 12:06:55 +02:00
Benoit Marty
d454e3fd20 Disable chat effect and confetti if animation are disabled on the system 
It will speed up the sanity test
 2022-05-05 12:02:44 +02:00
Benoit Marty
67bc7c93e6 Format file 2022-05-05 12:01:33 +02:00
Benoit Marty
66b32a74d5 Convert some fun to Context extensions 2022-05-05 11:57:54 +02:00
Onuray Sahin
ba4413e702 Fix stop sharing button state. 2022-05-05 12:57:53 +03:00
ganfra
83f8a8f278 Bump version to 1.4.16 2022-05-05 11:34:12 +02:00
ganfra
a5b007f147 Merge branch 'release/1.4.14' into main 2022-05-05 11:30:59 +02:00
ganfra
47f4db847a Merge tag '1.4.14' into develop 
v1.4.14
 2022-05-05 11:30:59 +02:00
ganfra
9420d309a5 Add changes 2022-05-05 10:38:49 +02:00
hanthor
341456901d
Merge branch 'vector-im:develop' into develop 2022-05-04 16:38:47 -04:00
hanthor
766e8a8076 Added file to changelog.d 2022-05-04 13:56:15 -04:00
ganfra
00ad9ccc2a
Merge pull request #5935 from vector-im/feature/fga/fix_weblate_lint 
Feature/fga/fix weblate lint
 2022-05-04 19:07:16 +02:00
Benoit Marty
330d802079
Merge pull request #5907 from vector-im/feature/bma/currentTimeMillis 
Use Clock interface
 2022-05-04 18:27:04 +02:00
ariskotsomitopoulos
c5fc1e579d Add badge in thread list filtering 2022-05-04 19:24:31 +03:00
ganfra
f2c35adb60 Fix TODO on strings 2022-05-04 18:19:03 +02:00
hanthor
b3b07752e2 Added themed icon for Android 13 2022-05-04 12:11:07 -04:00
Benoit Marty
a11c0b7ea1
Merge pull request #5885 from chagai95/patch-2 
don't pause timer when call is held
 2022-05-04 18:09:11 +02:00
ganfra
ed7343e897 Weblate: fix string with param 2022-05-04 18:06:05 +02:00
Benoit Marty
3faf0a238c Update after PR reviews 2022-05-04 17:57:47 +02:00
Benoit Marty
2fb5f423a5 Rename val 2022-05-04 17:52:32 +02:00
Benoit Marty
3ecde755e0 Rename val 2022-05-04 17:51:14 +02:00
Benoit Marty
2d98cbd915 Rename now to more explicit currentTimeMillis 2022-05-04 17:48:36 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
Henry Jackson
5ebc70e4bb Returned string references to the original name 2022-05-04 16:38:12 +01:00
emotionalamoeba
7a8565db5d
Update vector/src/main/res/values/strings.xml 
Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
 2022-05-04 16:27:13 +01:00
emotionalamoeba
9fe75eacf1
Merge branch 'vector-im:develop' into develop 2022-05-04 16:22:57 +01:00
ganfra
de531a17d9
Merge pull request #5931 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-04 17:15:52 +02:00
Michael Kaye
3a9f0232f0 Fix nightly build test report message. 2022-05-04 16:13:44 +01:00
Weblate
5cdea33418 Merge branch 'origin/develop' into Weblate. 2022-05-04 14:39:20 +00:00
chanthajohn keoviengkhone
f7d006c13b Translated using Weblate (Lao) 
Currently translated at 95.2% (2112 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-04 14:30:54 +00:00
ariskotsomitopoulos
faf5fc0012 Remove thread summary counter minEms 2022-05-04 17:10:09 +03:00
ariskotsomitopoulos
ad50c22e97 Add navigate to thread functionality on search results thread summary 2022-05-04 17:06:18 +03:00
Michael Kaye
48554a4769 Update version to fix name of parameter 'ratelimit' 2022-05-04 14:57:08 +01:00
Benoit Marty
9c558f1f15
Merge pull request #5928 from vector-im/bugfix/adm/login-in-other 
Fixing sign in via Other needing registration to be enabled
 2022-05-04 14:09:40 +02:00
ariskotsomitopoulos
f4b1e06ad1 Open thread timeline keyboard when user navigates from reply in thread action 2022-05-04 14:27:34 +03:00
ariskotsomitopoulos
88babbb17c Show room name instead of root message author in thread timeline toolbar 2022-05-04 14:11:48 +03:00
ariskotsomitopoulos
4b746ee345 Reduce thread list menu icon size 2022-05-04 13:55:53 +03:00