Commit graph

5958 commits

Author SHA1 Message Date
Valere
67295c6bdd Fix compilation 2021-08-27 17:55:52 +02:00
Valere
efa9ff0959 unused param 2021-08-27 17:30:32 +02:00
Valere
819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere
69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
Valere
4107d2643c
Merge pull request #3704 from vector-im/feature/bca/promote_restricted
Promote restricted join rule to admins
2021-08-27 17:27:57 +02:00
Benoit Marty
6dccc3e752
Merge pull request #3913 from vector-im/feature/bma/3910_fix_crash
Feature/bma/3910 fix crash
2021-08-27 17:09:13 +02:00
Benoit Marty
c6c66ccf31
Merge pull request #3903 from vector-im/feature/ons/fix_voice_message_lollipop_crash
Crash on opening a room on Android 5.0 and 5.1 - Regression with Voice message
2021-08-27 16:31:49 +02:00
Benoit Marty
72a6d6c9a6
Update vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt 2021-08-27 16:31:20 +02:00
Benoit Marty
33a3813e87 Fix a crash at start-up if translated string is empty 2021-08-27 16:05:16 +02:00
Valere
b9e2374a4c cleaning
review


fix string warning
2021-08-27 15:56:07 +02:00
Valere
6f45ba575b post rebase cleaning 2021-08-27 15:56:07 +02:00
Valere
e8d01becfe Code review 2021-08-27 15:56:07 +02:00
Valere
1f6b8d2b12 Check that is admin 2021-08-27 15:56:07 +02:00
Valere
de6b5af6ba Promote restricted join rule to admins 2021-08-27 15:56:07 +02:00
Benoit Marty
e78434d25c
Merge pull request #3900 from vector-im/feature/fre/expired_account_error
Add expired account error code
2021-08-27 15:09:08 +02:00
Florian Renaud
1ca4b3b78a Add expired account error code
For synapse instances which have activated and configured the email account validity module, an error code (ORG_MATRIX_EXPIRED_ACCOUNT) is triggered for any request authenticated by the user's access token which is expired.
This change only add the error code in the matrix SDK but does not handle it for now in the client side.

More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity
2021-08-27 14:28:07 +02:00
Benoit Marty
5b908c404e
Merge pull request #3863 from vector-im/feature/fga/new_voip_design
Feature/fga/new voip design
2021-08-27 12:02:35 +02:00
Benoit Marty
1815acf1ae
Merge pull request #3765 from vector-im/feature/bca/m11.12
Spaces | Default to 'Home' in settings
2021-08-27 12:01:52 +02:00
ganfra
fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
Onuray Sahin
41c0d4d14f Fix crash on lollipop devices due to onVisibilityChanged is called before constructor. 2021-08-26 13:50:23 +03:00
ganfra
26d2694301 Call: fix outgoing ring issue 2021-08-26 11:44:29 +02:00
Benoit Marty
97bdd14880
Merge pull request #3854 from vector-im/feature/fga/call_end_reasons_dialog
Call ended: handle busy reason and invite timeout.
2021-08-26 11:40:27 +02:00
ganfra
4518962658 New voip design: clean after benoit review 2021-08-26 11:08:34 +02:00
Benoit Marty
6fd66752bc
Merge pull request #3834 from Tigermouthbear/develop
Add mxid to autocomplete suggestion if multiple users have same displayname
2021-08-26 10:48:38 +02:00
Benoit Marty
f843712d7e
Merge pull request #3825 from vector-im/feature/dla/room_notification_settings
Room Notification Settings V2
2021-08-25 15:20:43 +02:00
Tigermouthbear
65076a4aec Add mxid to autocomplete suggestion if more than one user in a room has the same displayname, closes #1823
improve performance of duplicate displayname finding

fix code formatting

move member autocomplete disambiguation to AutocompleteMemberPresenter and preserve original order

Add mxid to autocomplete suggestion if more than one user in a room has the same displayname, closes #1823
2021-08-25 08:25:24 -04:00
Benoit Marty
37738489ba
Update vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt 2021-08-25 12:05:51 +02:00
David Langley
4d4d370b8f checks and remove build settings 2021-08-24 22:33:32 +01:00
David Langley
f8114dd7a1 Fix HomeList error snackbar and add dialog for bottom sheet errors 2021-08-24 22:28:31 +01:00
Valere
15cb31ac0d Code review 2021-08-24 16:39:32 +02:00
Valere
27df3e626e Spaces | Default to 'Home' in settings 2021-08-24 16:34:32 +02:00
ganfra
42bfa129b3 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-24 16:21:35 +02:00
ganfra
2b708387c2 New voip design: makes lint happy 2021-08-24 16:19:54 +02:00
David Langley
cd424b0766 fix checks 2021-08-24 12:17:39 +01:00
David Langley
fe800a56e2 Address comments. 2021-08-24 12:12:39 +01:00
Benoit Marty
1071797805
Merge branch 'develop' into patch-1 2021-08-23 16:15:15 +02:00
Benoit Marty
ee0b87bd82
Merge pull request #3786 from vector-im/feature/dla/fix_missing_notification_noise
Fix missing sounds on room notifications (messages, invitations, etc).
2021-08-23 15:04:20 +02:00
Benoit Marty
18936122a8
Merge pull request #3773 from pvagner/a11yAvatarVerbosity
a11y: change some content descriptions
2021-08-23 12:15:43 +02:00
Benoit Marty
ecbf8739cd
Merge pull request #3793 from pr0gr8mm3r/patch-1
Fix attachment menu animation order
2021-08-23 10:48:21 +02:00
Simon Wazynski
dfa0fb70d6 Fix swapped order 2021-08-18 21:03:40 +02:00
ganfra
121f17b93f Call: Clean code 2021-08-18 17:33:48 +02:00
ganfra
50a042683b Architecture: get rid of RoomSummariesHolder as it can lead to errors 2021-08-18 15:25:58 +02:00
ganfra
799cd99176 Call: make PiP works with 2 calls 2021-08-18 10:52:19 +02:00
ganfra
d3e4a3c010 Call: fix wrong opponent name 2021-08-18 10:51:03 +02:00
ganfra
3b1249c489 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-17 17:10:10 +02:00
ganfra
fce50adca6
Merge pull request #3847 from vector-im/feature/fga/fix_dial_pad_restore
Fix Dial pad lost entry when config changes #3845
2021-08-17 16:42:59 +02:00
ganfra
d7a3e6f2ca Also fix compilation error on strings.xml 2021-08-17 16:03:10 +02:00
ganfra
99a0d17dfc Call ended: handle busy reason and invite timeout. 2021-08-17 12:15:37 +02:00
ganfra
29279f0262 Fix Dial pad lost entry when config changes #3845 2021-08-16 18:27:01 +02:00
ganfra
36581a1f31 VoiP : fix string resource 2021-08-16 15:38:52 +02:00