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

9512 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damir Jelić
d15269a4bd rust: Add methods for the QR code verification 2021-06-28 11:37:27 +02:00
Damir Jelić
846242217b crypto: Move the VerificationRequest into a separate file 2021-06-28 11:37:27 +02:00
Damir Jelić
f95c4ae088 crypto: Allow cancelling of SAS transactions 2021-06-28 11:37:27 +02:00
Damir Jelić
f854e9cf1c crypto: Remove the intermediately CancelCode and use strings to map over FFI 2021-06-28 11:37:27 +02:00
Damir Jelić
b53b0a0093 crypto: Use a when instead of a big if/else statement 2021-06-28 11:37:27 +02:00
Damir Jelić
948aa1a141 crypto: Correctly pick up our device verification state 2021-06-28 11:37:27 +02:00
Damir Jelić
aad18ebec7 crypto: Move the sendToDevice logic to a common class and use it for verifications 2021-06-28 11:37:27 +02:00
Damir Jelić
6a79d022c3 crypto: Expose the trust state of our devices 2021-06-28 11:37:27 +02:00
Damir Jelić
6649aaca2e crypto: Support SAS verification up to showing emojis 2021-06-28 11:37:14 +02:00
Damir Jelić
e97ce33ed9 Merge remote-tracking branch 'upstream/develop' into rust-verification 2021-06-28 11:36:57 +02:00
Benoit Marty
0c88d11429 Version++ 2021-06-22 12:28:18 +02:00
Benoit Marty
0dec46eb18 Merge branch 'release/1.1.11' into develop 2021-06-22 12:27:44 +02:00
Benoit Marty
b76fd5dd4e Prepare release 1.1.11 2021-06-22 12:27:36 +02:00
Benoit Marty
48002e11b6
Merge pull request #3540 from vector-im/feature/bma/fix_composer 
Send button does not show up half of the time (#3535)
 2021-06-22 12:24:28 +02:00
Benoit Marty
434018074d
Merge pull request #3538 from vector-im/feature/fga/fix_signout 
Fix crash on signout: release session at the end of clean up
 2021-06-21 14:11:10 +02:00
Benoit Marty
c21b19f49f Send button does not show up half of the time (#3535) 2021-06-21 14:06:43 +02:00
ganfra
d8327a5161 Fix crash on signout: release session at the end so you clean up files first. 2021-06-21 11:10:10 +02:00
Damir Jelić
d00b54929f crypto: Add the scaffolding to connect the SAS verification to the rust side 2021-06-20 22:34:54 +02:00
Benoit Marty
b30c27b7a6 Version++ 2021-06-18 21:50:12 +02:00
Benoit Marty
729ce509d4 Merge branch 'release/1.1.10' into develop 2021-06-18 21:38:59 +02:00
Benoit Marty
d737d81458 Release 1.1.10: fastlane 2021-06-18 21:38:38 +02:00
Benoit Marty
dcce618fd5 Release 1.1.10: towncrier 2021-06-18 21:36:57 +02:00
Benoit Marty
d6363a6e1b Update template and use a more power full configuration 2021-06-18 21:35:09 +02:00
Benoit Marty
eea18fb71c Rename towncrier folder from newsfragment to changelog.d 2021-06-18 21:33:50 +02:00
Benoit Marty
71a8a948a6
Merge pull request #3530 from vector-im/feature/bma/prepare_release_1.1.10 
Prepare release 1.1.10
 2021-06-18 21:04:27 +02:00
Benoit Marty
c4a6d92481 Fix bad alpha on tinted drawable - 2 2021-06-18 17:59:55 +02:00
Benoit Marty
0720556e48 Fix bad alpha on tinted drawable - 1 2021-06-18 17:54:41 +02:00
Benoit Marty
e12b9a3dfe Fix crash due to style refacto 2021-06-18 17:28:25 +02:00
Benoit Marty
81053f5492 Use debouncedClick 2021-06-18 15:32:33 +02:00
Benoit Marty
15695dca69 Add some TextViews 2021-06-18 15:31:02 +02:00
Benoit Marty
9f101423e2 Add some TextViews 2021-06-18 15:08:51 +02:00
Benoit Marty
a619b0141a Rename file 2021-06-18 15:02:18 +02:00
Benoit Marty
1ffe57ce94 Change vctr_header_background alias from vctr_content_quinary to vctr_system 2021-06-18 13:27:21 +02:00
Benoit Marty
9a70ddf0b8 Fix color for tiles and space buttons 
Also remove unused resource
 2021-06-18 13:06:53 +02:00
Benoit Marty
aeffaac065 Update layout 
https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2857%3A321
 2021-06-18 12:59:12 +02:00
Benoit Marty
be578d7fae
Merge pull request #3484 from vector-im/feature/bca/spaces_alias 
Feature/bca/spaces alias
 2021-06-18 12:32:35 +02:00
Damir Jelić
0cb9f6be10 rust: Rework the rest of the sas verification methods 2021-06-18 12:16:55 +02:00
Valere
4180b4ccd3 Code review 2021-06-18 10:47:21 +02:00
Valere
301251262d Code review cleaning 2021-06-18 10:41:24 +02:00
Valere
19a2b56011 Code review AliasAvailabilityResult 2021-06-18 10:41:24 +02:00
Valere
9190e1bfb5 Code Review Formatting 2021-06-18 10:41:24 +02:00
Valere
88119a15bf Core review rename input Suffix|Prefix 2021-06-18 10:41:24 +02:00
Valere
b6b80120b2 update change log 2021-06-18 10:41:24 +02:00
Valere
28a6caf754 cleaning + rebase 2021-06-18 10:41:24 +02:00
Valere
b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere
fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Benoit Marty
5325c761f4
Merge pull request #3502 from vector-im/feature/bca/spaces_dnd 
Feature/bca/spaces dnd
 2021-06-18 10:28:59 +02:00
Benoit Marty
1538a62e37
Merge pull request #3523 from vector-im/feature/bma/preparing_release 
Preparing release 1.1.10
 2021-06-18 10:26:44 +02:00
Benoit Marty
dd1f65dd6f Run ./tools/import_emojis.py 
Only a small issue is fixed
 2021-06-18 10:25:37 +02:00
Benoit Marty
930675d4c9 Add a formatted version of emoji_picker_datasource.json. Not included in the APK. 2021-06-18 10:25:37 +02:00