mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-22 09:14:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
10222 commits 160 branches 159 tags 271 MiB
Commit graph

513 commits

Author SHA1 Message Date
Benoit Marty
65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite 
support email invite
 2021-08-27 19:02:42 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +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
David Langley
68eaefbc9c Show error dialog rather than toast. Add validation to keyword field for slashes and dots. 2021-08-27 15:48:11 +01: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
de6b5af6ba Promote restricted join rule to admins 2021-08-27 15:56: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
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
David Langley
daaa40b27a Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-25 17:41:37 +01: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
David Langley
fb8c7f6be0 lint 2021-08-24 19:08:27 +01:00
David Langley
238f772461 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-24 15:51:23 +01:00
David Langley
be19f759f6 fix ordering of chips and align left for notification screens. 2021-08-24 15:46:41 +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
Benoit Marty
18936122a8
Merge pull request #3773 from pvagner/a11yAvatarVerbosity 
a11y: change some content descriptions
 2021-08-23 12:15:43 +02:00
ganfra
3b1249c489 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-17 17:10:10 +02:00
ganfra
99a0d17dfc Call ended: handle busy reason and invite timeout. 2021-08-17 12:15:37 +02:00
ganfra
36581a1f31 VoiP : fix string resource 2021-08-16 15:38:52 +02:00
ganfra
452647fb00 Remove jitsi widget: change threshold + wording 2021-08-12 18:50:58 +02:00
David Langley
a355f61a7e Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/room_notification_settings 2021-08-11 12:21:34 +01:00
ganfra
bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
ganfra
9027e94cfe Timeline call tiles: start changing status handling 2021-08-11 12:09:59 +02:00
David Langley
7f3c4f0073 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-08-10 10:54:22 +01:00
David Langley
8d7e3b6544 add keyword checkbox preference and chip/edit text for modificying keywords 2021-08-03 09:52:36 +01:00
Peter Vágner
ed6498fce1 a11y: change some content descriptions 
A lot of items e.g. member items, room items, space items as well as dialog top bar are prefixed with the word avatar. Remove this and make some accessibility specific strings shorter.

Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-08-01 22:03:59 +02:00
Valere
aaa9c7e795 fix rebase 2021-07-30 19:05:47 +02:00
Valere
efdaa49e70 Code review 2021-07-30 18:44:25 +02:00
Valere
c9ef08d8a9 handle migration before setting restricted 2021-07-30 18:43:50 +02:00
Valere
6c2a917d9f WIP 2021-07-30 18:43:34 +02:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message 
Voice Message
 2021-07-30 17:24:17 +03:00
Onuray Sahin
1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
Onuray Sahin
cdd2fca258 Design review fixes. 2021-07-29 18:41:29 +03:00
David Langley
73bf50b93c rename global -> default, address comments 2021-07-27 20:21:40 +01:00
David Langley
7091de9942 merge in static push definitions and adapt push v2 ui/logic 2021-07-27 19:54:17 +01:00
Benoit Marty
a7e3c0d0d8 Fix wording when verification is cancelled. 2021-07-27 17:31:19 +02:00
Onuray Sahin
4c8a8d8cfb Design review fixes. 2021-07-27 15:32:35 +03:00
David Langley
57c32502e5 change notification state options as outlined in v2 2021-07-23 23:18:39 +01:00
David Langley
90e04d4358 add header footer and fix toolbar 2021-07-23 22:37:36 +01:00
Onuray Sahin
a11941714d Code review fixes. 2021-07-23 15:19:50 +03:00
ganfra
4788630949 Merge branch 'develop' into feature/fga/new_voip_design 2021-07-23 12:17:05 +02:00
Andrew Morgan
4dd5b2c884
grammar: Server matching ... -> Servers matching ... 
This commit uses the plural form of Server as each message is talking about *one or more* servers in the room.
 2021-07-22 11:58:32 +01:00
ganfra
8955049110 Minor changes after benoits review 2021-07-21 17:35:08 +02:00