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
3867 commits 160 branches 159 tags 271 MiB
Commit graph

2201 commits

Author SHA1 Message Date
code-surfer
7fb7729af6 Translated using Weblate (German) 
Currently translated at 95.8% (1601 of 1672 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/de/
 2020-05-03 14:14:24 +00:00
random
fbc46b3c8b Translated using Weblate (Italian) 
Currently translated at 100.0% (1672 of 1672 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/it/
 2020-05-03 14:14:24 +00:00
n3niu
e986c9d343 Translated using Weblate (German) 
Currently translated at 95.6% (1599 of 1672 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/de/
 2020-05-03 14:14:24 +00:00
Kévin C
5eb9f32acb Translated using Weblate (French) 
Currently translated at 100.0% (1672 of 1672 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/fr/
 2020-05-03 14:14:24 +00:00
Jeff Huang
077c166c09 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1672 of 1672 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/zh_Hant/
 2020-05-03 14:14:24 +00:00
yuuki-san
0cc48a190f Translated using Weblate (Slovak) 
Currently translated at 54.2% (904 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/sk/
 2020-05-03 14:14:24 +00:00
random
8206a78156 Translated using Weblate (Italian) 
Currently translated at 98.7% (1645 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/it/
 2020-05-03 14:14:24 +00:00
Jeff Huang
6a1e38ca04 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/zh_Hant/
 2020-05-03 14:14:24 +00:00
rkfg
55f7461747 Translated using Weblate (Russian) 
Currently translated at 75.4% (1257 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/ru/
 2020-05-03 14:14:24 +00:00
Kévin C
7665aba22c Translated using Weblate (French) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/fr/
 2020-05-03 14:14:24 +00:00
Jeff Huang
e96c5f7305 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1667 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/zh_Hant/
 2020-05-03 14:14:24 +00:00
yuuki-san
c5ba34d619 Translated using Weblate (Slovak) 
Currently translated at 54.0% (901 of 1667 strings)

Translation: Riot Android/RiotX application
Translate-URL: https://translate.riot.im/projects/riot-android/riotx-application/sk/
 2020-05-03 14:14:24 +00:00
Benoit Marty
bb427700d2
Merge pull request #1310 from vector-im/feature/room_creation 
Several fixes on room creation collpasing events (Fixes #1309)
 2020-04-30 18:19:49 +02:00
Valere
b3dbcd7936 Show untrusted first 2020-04-30 15:43:19 +02:00
Valere
cac246aa15 update copy 2020-04-30 15:43:05 +02:00
Onuray Sahin
d2f0957eba
Merge branch 'develop' into feature/invite_members_to_room 2020-04-30 16:11:52 +03:00
onurays
db18272ef2 Remove strings from strings_riotX.xml 2020-04-30 15:47:31 +03:00
onurays
5dc50195b3 Filter existing room members. 2020-04-30 15:28:20 +03:00
onurays
57a87ba620 Add InviteUsersToRoomActivity and mvrx classes. 2020-04-30 13:54:09 +03:00
Benoit Marty
f6cbc15cf7 Several fixes on room creation collpasing events (Fixes #1309) 
- do not collapse room member events
- collapse other type of event: topic, alias, canonical alias, powel level
- Use correct user name for collapsed version (should be fixed twice due to the previous change of excluding some room member events)
- align "join" and "left" string with Riot-Web
 2020-04-30 12:52:21 +02:00
Benoit Marty
7322144dc8 Remove duplicated strings 2020-04-30 12:15:26 +02:00
Valere
7b20db64a5
Merge branch 'develop' into feature/e2e_timeline_decoration 2020-04-30 12:01:44 +02:00
Valere
429c634ed9
Merge pull request #1308 from vector-im/feature/fix_dm_shield_logic 
Fix / Move DM shield rules to task
 2020-04-30 12:00:18 +02:00
Valere
43eb804b23
Merge pull request #1303 from vector-im/feature/xs_old_new_session_detection 
Feature/xs old new session detection
 2020-04-30 11:23:15 +02:00
Valere
5840248ffa Fix / NPE Optional#get instead of getOrNull 2020-04-30 11:11:11 +02:00
Valere
9586fa9f90 Typo in file name 2020-04-30 10:11:32 +02:00
Valere
0d0af6906e Code review 2020-04-30 10:10:56 +02:00
Valere
93070f3524 Fix / use distinct until change 2020-04-30 09:50:47 +02:00
Valere
7cf7b7e10e Fix / avoid showing legacy start toaster under verif bottomsheet 2020-04-30 09:50:38 +02:00
Valere
1de4869cde Fix / reuse cell keeps icon 2020-04-30 09:50:11 +02:00
onurays
a4eba653a3 Make a generic user directory search & selection views. 2020-04-30 02:50:30 +03:00
Valere
3cf341c3bf code quality 2020-04-29 18:48:26 +02:00
Valere
f0a9be2ec7 Better session detection 2020-04-29 18:46:36 +02:00
ganfra
1a307a0c4d Template: let the ViewModel factory be agnostic of the host 2020-04-29 17:58:54 +02:00
Valere
dcfd9ee7a7 Fix copy 2020-04-29 15:12:07 +02:00
Valere
0f00597444 Fix / Regression on non e2e device 
+ migrate to new rx objects
 2020-04-29 12:35:22 +02:00
Valere
a806f70b35 New security alert to review old sessions 2020-04-29 12:04:59 +02:00
Valere
39e18446ae fix typo 2020-04-29 09:34:28 +02:00
Benoit Marty
87979ccadd
Merge pull request #1299 from vector-im/feature/emoji_perf 
Emoji completion for 🎉
 2020-04-28 23:41:02 +02:00
Benoit Marty
dc6d4c6789 Remove problematic translation 2020-04-28 21:54:14 +02:00
Benoit Marty
db3d5e2677 Remove not used anymore translations 2020-04-28 21:36:34 +02:00
Benoit Marty
6dc8bdde04 Import translation from Riot-Android 2020-04-28 21:35:39 +02:00
Valere
947c46d7b5 Avoid negative margin 2020-04-28 19:16:29 +02:00
Valere
a05c401892 Code review 2020-04-28 18:47:54 +02:00
onurays
f25c981173 Add menu item to invite users to the room. 2020-04-28 17:30:23 +03:00
Benoit Marty
a4192a0761 Emoji completion 🎉 does not completes to 🎉 like on web (#1285) 2020-04-28 14:29:43 +02:00
Benoit Marty
9c8ff7de7f Add Android test for EmojiDataSource 2020-04-28 14:15:50 +02:00
Valere
cdabca6def Fix copy 2020-04-28 13:20:30 +02:00
Valere
2d6f0205a4 Update manage sessions screen 2020-04-28 13:20:30 +02:00
Valere
798e9e4fde
Merge pull request #1287 from vector-im/feature/improve_security_toaster 
Remember ignored unknown sessions
 2020-04-28 12:38:14 +02:00
Valere
8871390167 Code review 2020-04-28 12:25:50 +02:00
Benoit Marty
df335c7aa3
Merge pull request #1290 from vector-im/feature/cleanup_ui_state 
Clear preferences when user logs out
 2020-04-28 10:54:48 +02:00
Benoit Marty
8bd4cc8f54
Merge pull request #1277 from vector-im/feature/sso 
Use correct sso url
 2020-04-27 14:36:37 +02:00
Benoit Marty
b1e1b4a7dc Remove "Reset keys" developer action 2020-04-27 14:25:45 +02:00
Benoit Marty
a233e9b0a0 Avoid code duplication, and improve readability 2020-04-27 14:25:45 +02:00
Benoit Marty
ebecb9bb9a i18n 2020-04-27 14:25:07 +02:00
Benoit Marty
35962c3cb5 Do not propose bootsrap for SSO accounts 
Because we do not support yet confirming account credentials using SSO
 2020-04-27 14:25:07 +02:00
Benoit Marty
0ac6a26b6e Add "continue" button to the bootstrap bottom sheet 2020-04-27 14:25:07 +02:00
Benoit Marty
0a887c0926 Cleanup 2020-04-27 14:25:07 +02:00
Benoit Marty
54c0239969 fix layout issue when text is displayed on 2 lines 2020-04-27 14:25:07 +02:00
Benoit Marty
8559254593
Merge pull request #1289 from vector-im/feature/fix-edited_event_click 
Do not handle url if it is not valid.
 2020-04-27 14:24:25 +02:00
onurays
626eb4d06b Comments added to explain why we should check if the url is valid. 2020-04-27 13:44:16 +03:00
Benoit Marty
a633c11c1d Do not clear developer preference when logging out 2020-04-27 12:29:38 +02:00
Benoit Marty
a4931e21ae Clear sharedPreference when logging out 2020-04-27 12:26:19 +02:00
onurays
6c4e71d7d4 Do not handle url if it is not valid. 2020-04-27 12:26:35 +03:00
Valere
ad0ad502aa Fix / backup key was not save in 4S after bootstrap 2020-04-27 11:14:13 +02:00
Valere
42b47c25aa Remember ignored unknown sessions 2020-04-27 10:09:37 +02:00
Benoit Marty
7ef1970a0b Better layout preview 2020-04-27 01:17:20 +02:00
Valere
20e5ebc88b Decorate timeline with e2e warning 2020-04-24 16:50:56 +02:00
onurays
52aa57ac7c Fix the color of misleading url according to design document. 2020-04-24 17:18:59 +03:00
Benoit Marty
8daf72a4b0 Use correct URL for SSO connection (#1178) 2020-04-24 15:54:02 +02:00
Benoit Marty
51eb2cda95 Move some constants to the Matrix SDK 2020-04-24 15:53:30 +02:00
Onuray Sahin
f0648ee52a
Merge branch 'develop' into feature/misleading_url_target 2020-04-24 11:24:39 +03:00
Valere
22c3ed6bb9 Code review 2020-04-23 21:20:01 +02:00
Valere
b0d25fa84f Update vector/src/main/res/values/strings_riotX.xml 
Co-Authored-By: Benoit Marty <benoitm@matrix.org>
 2020-04-23 21:16:46 +02:00
Valere
57636207d2 Fix copy 2020-04-23 21:16:46 +02:00
Valere
f7e7659750 klint 2020-04-23 21:16:28 +02:00
Valere
e719541b5e Fix / crash when generating random key 2020-04-23 21:16:28 +02:00
Valere
bd7acfbb1a Add option to recover with recovery key 2020-04-23 21:16:28 +02:00
Valere
928149fe35
Merge branch 'develop' into feature/update_design_complete_secu 2020-04-23 21:13:53 +02:00
Onuray Sahin
a80181da9e
Merge branch 'develop' into feature/misleading_url_target 2020-04-23 20:18:44 +03:00
onurays
72de5d6adc Code review fixes. 2020-04-23 20:17:52 +03:00
Benoit Marty
4ee13b6fa1
Merge branch 'develop' into feature/unwedging 2020-04-23 18:20:09 +02:00
Benoit Marty
33fb1dd147
Merge pull request #1262 from vector-im/feature/fix_add_by_user_id 
Add user to direct chat by user id.
 2020-04-23 18:05:15 +02:00
Valere
736905edf8
Merge pull request #1269 from vector-im/feature/complete_security_hide_4s 
Hide Use recovery key when 4S is not setup
 2020-04-23 18:03:14 +02:00
Benoit Marty
e8a91eab88
Merge pull request #1265 from vector-im/feature/deactivate 
Deactivate account using password
 2020-04-23 17:30:08 +02:00
Valere
b951af0116 RiotX spelling 2020-04-23 17:00:37 +02:00
onurays
c3299845c1 use generic cancel and continue strings. 2020-04-23 17:44:30 +03:00
onurays
54644db587 Dialog design fixes. 2020-04-23 17:37:30 +03:00
Valere
cb0e93c43e use theme notice color 2020-04-23 16:23:36 +02:00
Valere
4c4ec6cfe8 Code review accessibility 2020-04-23 16:13:19 +02:00
Valere
449be02f53 update icon tint 2020-04-23 16:05:43 +02:00
Valere
25d2c2e2c6 Update design wait for self verification 2020-04-23 15:45:21 +02:00
onurays
ec2ba7c0b2 Do not warn if the domain of urls are the same and colorize links. 2020-04-23 16:30:37 +03:00
onurays
06a13d5c20 Show a warning dialog if the text of the clicked link does not match the link target 
Fixes #922
 2020-04-23 15:42:57 +03:00
Valere
7e0591ffee Hide Use recovery key when 4S is not setup 2020-04-23 11:14:20 +02:00
Benoit Marty
1363100f94 Create DM: now any userId can be entered, so deal with the case of the userId does not exists. 
Use same string resource value than Riot-Web
 2020-04-22 23:03:04 +02:00
Benoit Marty
06cf59bca7 Even if it's not happening, do not add the search term if already present in the results. 2020-04-22 19:20:13 +02:00
Valere
e37dd547b8 code review 2020-04-22 18:50:59 +02:00
Benoit Marty
671c1259af
Merge pull request #1239 from waylon531/develop 
Use a bigger thread pool
 2020-04-22 18:23:37 +02:00
Benoit Marty
3d07ccd98e auto-review. Password could be only spaces... 2020-04-22 18:03:47 +02:00
Benoit Marty
03b9774c56 ktlint 2020-04-22 17:56:13 +02:00
Benoit Marty
0f1ddee71c Use SwitchCompat 2020-04-22 17:54:25 +02:00
Benoit Marty
855efa93cc Remove cancel button, useless. 2020-04-22 17:29:34 +02:00
Valere
d0f776a9cf Discard session command only encrypted room 2020-04-22 16:41:34 +02:00
Benoit Marty
da66e38c68 Close drawer when opening settings 2020-04-22 16:02:06 +02:00
Benoit Marty
a4ba8c152d Add IME action to the password field 2020-04-22 15:51:34 +02:00
Valere
9b320ed3c7 Fix unwedging 2020-04-22 15:40:59 +02:00
Benoit Marty
c854491248 Be more robust 2020-04-22 15:00:04 +02:00
Benoit Marty
8c8a84b039 Account deactivation: the task does the cleanup 2020-04-21 20:41:10 +02:00
Benoit Marty
045e3d7bae Account deactivation (with password only) (#35) 2020-04-21 20:31:54 +02:00
onurays
3163bc8b80 Add user to direct chat by user id. 
Fixes #1065
 2020-04-21 15:25:48 +03:00
Valere
63355ca256 code review 2020-04-21 11:06:56 +02:00
Valere
8a4f0a0c00 KeyBackup / Use 4S if key in quadS 2020-04-20 19:21:44 +02:00
Benoit Marty
6cad129625 Still waiting for translation update 2020-04-20 16:13:16 +02:00
Benoit Marty
9ccf51fbc0 Import string from Riot - new strings 2020-04-20 15:20:08 +02:00
Benoit Marty
990867204e Import string from Riot 2020-04-20 15:17:14 +02:00
Onuray Sahin
5795b7e063
Merge pull request #1242 from vector-im/feature/save_media_to_gallery 
Save media files to Gallery
 2020-04-20 13:24:33 +03:00
Valere
50c73b68aa cleaning 2020-04-20 11:31:42 +02:00
Valere
43cb1fe68b Code review 2020-04-20 11:12:35 +02:00
onurays
f807de9a83 Lint fix. 2020-04-20 11:53:33 +03:00
Onuray Sahin
754f220596
Merge branch 'develop' into feature/save_media_to_gallery 2020-04-20 11:21:14 +03:00
onurays
3f7ca8669a Remove duplicated save icon. 2020-04-20 00:48:52 +03:00
Valere
28c6921a0a Avoid unnecessary /device call 2020-04-17 18:08:29 +02:00
onurays
26bb8ce2be Give user a toast after adding media file to the gallery. 2020-04-17 16:53:40 +03:00
onurays
8434f9326e Save action added to bottom sheet. 2020-04-17 15:27:42 +03:00
Waylon Cude
68f93c6c31
Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop 
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 12:19:17 -07:00
Valere
3fe15f2d45 code review 2020-04-16 17:02:01 +02:00
Valere
968377a5be
Update vector/src/main/res/values/strings_riotX.xml 
Co-Authored-By: Benoit Marty <benoitm@matrix.org>
 2020-04-16 16:53:24 +02:00
Valere
7ac5f58f32 Show CrossSigning info even if not developer mode 2020-04-16 16:30:45 +02:00
Valere
ce2f4e163d Update password/recovery copy + update icons 2020-04-16 16:30:45 +02:00
onurays
ab3cc90ed5 Share menu item added to video media viewer. 2020-04-16 16:46:00 +03:00
Valere
f68e84d9da Update toaster to match web 2020-04-16 15:09:16 +02:00
onurays
2b2e6dd6f8 Share menu item added to image media viewer. 2020-04-16 16:04:37 +03:00
Benoit Marty
828e972c74 Split long lines 2020-04-16 14:35:55 +02:00
Benoit Marty
d934f92ebd Fix bad apostrophe 2020-04-16 13:58:54 +02:00
Waylon Cude
d20cf484ff
Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop 
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 03:10:06 -07:00
waylon531
6c1719e365
Use a bigger thread pool 
This patch makes RiotX use an unbounded thread pool to handle
connections. The default thread pool for the android WorkManager has a
fairly anemic number of threads and I suspect this was causing
performance issues especially because of all the long-running jobs that
happen whenever you sync.

I tested this out on my phone and all of the sluggishness appears to
have gone away. I tested both the debug and release builds to make sure
it wasn't just some release optimization. RiotX is so much snappier now!

This fixes #1221

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 02:44:31 -07:00
Valere
a44cb876c9 move strings to resources 2020-04-16 11:30:10 +02:00
Valere
e79c824913 Fix / password visibility initial state bug 2020-04-16 11:30:10 +02:00
Valere
b8e9cc70f2 fix / line too long 2020-04-16 11:30:10 +02:00
Valere
a2f32307f0 Support back from migrate recovery key 2020-04-16 11:30:10 +02:00
Valere
c1d39cefd5 Fix / avoid upgrade secu popup on account creation 2020-04-16 11:30:10 +02:00
Valere
aa496e6efb Add migration state to bootstrap 2020-04-16 11:30:10 +02:00
Benoit Marty
1372192031
Merge pull request #1091 from vector-im/feature/secure 
Add a setting to prevent screenshot of the application, disabled by default (#1027)
 2020-04-16 11:27:59 +02:00
Benoit Marty
ea03f76847
Merge pull request #1129 from vector-im/feature/update_password 
Change password function implemented.
 2020-04-16 11:26:33 +02:00
Benoit Marty
634c8947bd
Merge branch 'develop' into refresh-summary 2020-04-15 17:29:08 +02:00
Benoit Marty
66f6b1ecac
Merge pull request #1224 from vector-im/feature/composer_shield 
Add shield in composer
 2020-04-15 16:49:50 +02:00
Benoit Marty
affe2b59da Fix crash 2020-04-15 16:40:01 +02:00
Benoit Marty
757f8ec96a Change password: prevent cancellation when processing 2020-04-15 16:39:05 +02:00
Benoit Marty
bf5e2b96df Change password: bigger margins 2020-04-15 16:39:05 +02:00
Benoit Marty
5666965321 Change password: do not trim passwords 2020-04-15 16:39:05 +02:00
Benoit Marty
7bf1f916c4 Change password: lambda 2020-04-15 16:39:05 +02:00
Benoit Marty
d44e43d94b Change password: update wording of button (Nad's request) 2020-04-15 16:39:05 +02:00
Benoit Marty
9fe32fe915 Change password: hide the preference (as Riot-Web does) if it is not possible to change the password. 2020-04-15 16:39:05 +02:00
Benoit Marty
e21cb3082b Change password: update preference summary. Some people think we know the password. Using Riot-web wording 2020-04-15 16:39:05 +02:00
Benoit Marty
c50bc10f92 Code review: improve layout 2020-04-15 16:38:44 +02:00
Benoit Marty
1b416028b4 Code review: inline the error instead of using toast 2020-04-15 16:38:44 +02:00
Benoit Marty
85493b7532 Code review: use isInvalidPassword() extension everywhere. Also be robust if the Fragment is destroyed 2020-04-15 16:38:44 +02:00
onurays
dfc8e8ec4c AccountService is created. 2020-04-15 16:38:44 +02:00
onurays
f00db49bda Change password function implemented. 
Fixes #528
 2020-04-15 16:38:44 +02:00
Valere
81012746c4 Code review / added new key for message hint 2020-04-15 15:39:23 +02:00
Valere
1deacfbb34 Code review 2020-04-15 15:37:43 +02:00
Valere
c35d854776 Add shield in composer 2020-04-15 15:37:43 +02:00
Benoit Marty
c0fa259b40 Add a setting to prevent screenshot of the application, disabled by default (#1027) 2020-04-15 15:04:19 +02:00
Benoit Marty
6d56220d98
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-15 15:00:34 +02:00
Nolan Darilek
2e4d30ef29 Set tickerText to improve accessibility of notifications. 
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
 2020-04-15 07:43:41 -05:00
Benoit Marty
c57fa3f0d0
Merge pull request #1176 from vector-im/feature/target-sdk-29 
Increase targetSdk to 29
 2020-04-15 14:32:16 +02:00
Benoit Marty
0c0e9521f5 Fix lint issue 2020-04-15 09:50:25 +02:00
Benoit Marty
e54077e020 String copied to Riot project 2020-04-14 17:26:23 +02:00
Benoit Marty
9111800e7a Create specific string for RiotX 2020-04-14 17:23:59 +02:00
Benoit Marty
ef6847671a Import strings from Riot 2020-04-14 17:13:43 +02:00
onurays
667b371653 Continue supporting old APIs. 2020-04-14 16:29:11 +03:00
onurays
190fbb95ec Merge branch 'develop' into feature/target-sdk-29 
# Conflicts:
#	vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
 2020-04-14 13:59:54 +03:00
Valere
ccacd20428
Merge branch 'develop' into feature/verification_unified_emoji 2020-04-10 16:05:33 +02:00
Valere
9cfb83f0d2 Remove outdated translation 2020-04-10 14:31:03 +02:00
Valere
943ba3bebd Fix / string bad argument number - lint 2020-04-10 13:14:12 +02:00
Valere
fccfd00949 Fix / design update 2020-04-10 12:12:21 +02:00
Valere
5081361c2d Update Scan confirm flow 2020-04-10 12:12:06 +02:00
Valere
f5dc0b38ff Code review 2020-04-10 11:47:54 +02:00
Valere
8357abd455 Added prefix to resources to avoid accidental override 2020-04-10 11:18:41 +02:00
Valere
a703574004 Uniform emoji representation for all platform 2020-04-10 11:02:33 +02:00
Christopher Rossbach
ef2abbfbd4
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-09 11:11:44 +02:00
Valere
7c0137e2dc Fix / await callback suspend forever 2020-04-09 10:46:52 +02:00
Valere
34dec64d9c Fixes #1214 2020-04-08 17:56:12 +02:00
Valere
6f2d7aebba code review 2020-04-08 16:37:52 +02:00
Valere
366a35913b Fix alignement 2020-04-08 16:31:01 +02:00
Valere
f04d8b0e03 cleaning 2020-04-08 16:31:01 +02:00
Valere
08af61b778 rename layout 2020-04-08 16:31:01 +02:00
Valere
277f35a352 Merge room creation events in one summary 2020-04-08 16:31:01 +02:00
Valere
68512e475f WIP 2020-04-08 16:31:01 +02:00
Onuray Sahin
8a4a288074
Merge branch 'develop' into feature/target-sdk-29 2020-04-08 14:15:02 +03:00
onurays
5b1f887760 Code review fixes. 2020-04-08 14:10:31 +03:00
Christopher Rossbach
3ff5952417
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-07 20:53:31 +02:00
Christopher Rossbach
222b72a014
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-07 17:46:23 +02:00
Valere
8904ca27f2 clean 2020-04-07 15:30:19 +02:00
Valere
1a436f962f update change log 
cleaning
 2020-04-07 15:15:45 +02:00
Valere
5b4b5e7a57 Gossip keybackup key after verification! 2020-04-07 15:15:45 +02:00
Valere
153587bd82
Merge branch 'develop' into feature/crosssigning_bootstrap 2020-04-07 15:14:43 +02:00
Valere
326f2e99fb klint 2020-04-06 10:00:59 +02:00