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
15823 commits 7 branches 124 tags 230 MiB
Commit graph

9092 commits

Author SHA1 Message Date
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Benoit Marty
5df0488cf2 Apply ouchadam's suggestion. It's only accessed by the main thread. 2022-05-17 14:44:43 +02:00
Benoit Marty
46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
Benoit Marty
32573881e4 Renames ids for clarity 2022-05-17 13:42:53 +02:00
Benoit Marty
2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Benoit Marty
ea1607cf3f Improve preview of the layout in the IDE 2022-05-17 10:28:02 +02:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
ariskotsomitopoulos
72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00
Benoit Marty
3fc4083aca Make the constructor public 2022-05-16 12:23:10 +02:00
Benoit Marty
92c0d97110 Rename API 2022-05-16 12:22:18 +02:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away 
add presence indicator busy and away
 2022-05-16 11:26:11 +02:00
Benoit Marty
c25845b959 Detekt: enable and fix EndOfSentenceFormat for analytics plan 
Will require https://github.com/matrix-org/matrix-analytics-events/pull/63 for long term solution
 2022-05-16 10:56:29 +02:00
chagai95
c27958d772
Add Busy string and change Unavailable to Away 2022-05-16 10:50:58 +02:00
Benoit Marty
4c95aafe10 Detekt: enable and fix EndOfSentenceFormat 2022-05-16 08:54:07 +02:00
Benoit Marty
9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt 
Detekt
 2022-05-13 23:40:53 +02:00
Valere
d40f8b0c56
Merge pull request #5939 from vector-im/feature/bca/fix_5906 
Desynchronized 4S | Megolm backup causing Unusable backup
 2022-05-13 15:43:18 +02:00
chagai95
9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00
Benoit Marty
03ec9946ff Detekt: fix ConstructorParameterNaming 
UserProperties fix is also in https://github.com/matrix-org/matrix-analytics-events/pull/62
 2022-05-12 22:17:56 +02:00
Adam Brown
cad9d443be
Merge pull request #6013 from vector-im/feature/adm/hide-ftue-ems 
FTUE - Temporarily hide EMS section
 2022-05-12 18:09:28 +01:00
Valere
8077406cba code review 2022-05-12 18:45:35 +02:00
Valere
22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
David Langley
44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01:00
Benoit Marty
6f3b9c78b0 Detekt: fix FunctionParameterNaming 2022-05-12 17:56:05 +02:00
Benoit Marty
c303b9afd3 Ignore more rules 2022-05-12 17:54:30 +02:00
Benoit Marty
f02bad5c79 Detekt: fix ArrayPrimitive 2022-05-12 17:54:15 +02:00
Benoit Marty
c3b5ba5639 Detekt: fix MatchingDeclarationName 2022-05-12 17:44:44 +02:00
Benoit Marty
21904054a5 Detekt: ignore EmptyCatchBlock 2022-05-12 17:29:10 +02:00
Benoit Marty
cdbc9db890 Detekt: fix EmptyDefaultConstructor 2022-05-12 17:25:16 +02:00
Benoit Marty
824f029e20 "TODO:" is forbidden by Detekt 2022-05-12 17:06:52 +02:00
Ahmed Radhouane Belkilani
6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline 
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
 2022-05-12 15:43:20 +02:00
ariskotsomitopoulos
40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
 2022-05-12 14:41:38 +03:00
Benoit Marty
4309fdba7e
Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair 
Remove remaining dead code about flair
 2022-05-12 11:31:42 +02:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop 
Added themed icon for Android 13
 2022-05-11 17:34:38 +02:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0 
Bump preference-ktx from 1.1.1 to 1.2.0
 2022-05-11 16:17:17 +02:00
Benoit Marty
1ef5416b50 Use the correct lint rule to ignore. 2022-05-11 15:02:01 +02:00
Benoit Marty
2ec86fe9e6 Remove remaining dead code about flair 
Finish the work started at #5664
 2022-05-11 10:52:55 +02:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21 
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
 2022-05-10 18:23:51 +02:00
Benoit Marty
fe8648c7f8 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:19:53 +02:00
Benoit Marty
5ad2567633 Fix compilation error after bump preference-ktx from 1.1.1 to 1.2.0 2022-05-10 15:00:44 +02:00
Benoit Marty
eafe65b417
Merge pull request #5831 from emotionalamoeba/develop 
Updated copy and moved override in profile screen
 2022-05-10 14:40:40 +02:00
Onuray Sahin
185cd316c9
Merge pull request #5911 from vector-im/feature/ons/voip_screen_sharing 
Screen sharing over WebRTC
 2022-05-10 13:06:33 +03:00
Adam Brown
33c1e1ea11 EMS section is temporarily hidden whilst we sync with marketing 2022-05-10 10:55:46 +01:00
Onuray Sahin
bb862cc509 Lower alpha of video button while screen sharing. 2022-05-10 11:35:38 +03:00
Benoit Marty
e35bb772c1
Merge pull request #5941 from vector-im/feature/bma/konfetti_speed 
No animation -> no chat effect
 2022-05-09 17:05:53 +02:00
Onuray Sahin
3a02e8405d Disable video toggle button during screen sharing. 2022-05-09 17:26:35 +03:00
Onuray Sahin
9a1dbb27d4 Stop proximity sensor while sharing screen. 2022-05-09 13:25:00 +03:00
hanthor
e1960e9593
Merge branch 'vector-im:develop' into develop 2022-05-06 14:57:11 -04:00
Aris Kotsomitopoulos
3c9b5d2ec0
Merge pull request #5927 from vector-im/feature/aris/threads_improve_rendering_issue_5151 
Feature/aris/threads improve rendering issue 5151
 2022-05-06 17:19:01 +03:00