Commit graph

9068 commits

Author SHA1 Message Date
ericdecanini
21fe5a23fb Adds vertical centering of title when no subtitle is present 2022-05-13 13:07:20 +02:00
ericdecanini
52c404ac9c Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader 2022-05-12 14:36:04 +02: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
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
Onuray Sahin
cf3d145cd6 Bind to screen sharing service after app killed and relaunched. 2022-05-06 13:21:33 +03:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02:00
ericdecanini
4266c330de Reverts change to when arrow alignment on some classes 2022-05-05 19:33:45 +02:00
ericdecanini
3fb03e2b2c Reformats project based on editorconfig 2022-05-05 19:10:35 +02:00
hanthor
6cd92a5d77
Merge branch 'vector-im:develop' into develop 2022-05-05 12:23:46 -04:00
ClaireG
c9bd1f32b9
Update notifications rules: make a sound for each notification 2022-05-05 14:02:11 +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
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
hanthor
341456901d
Merge branch 'vector-im:develop' into develop 2022-05-04 16:38:47 -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
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
2fb5f423a5 Rename val 2022-05-04 17:52:32 +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
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
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
Onuray Sahin
b358863a1e Code review fixes. 2022-05-04 13:43:44 +03:00
Adam Brown
f42e6c0a3c fixing sign in needing registration to be enabled
- caused by the sign in flow using the registration homeserver validation, fixed by posting the sign in mode event directly
2022-05-04 11:36:36 +01:00