filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,566 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

407 Commits

Author SHA1 Message Date
Benoit Marty 8daf72a4b0 Use correct URL for SSO connection (#1178) 2020-04-24 15:54:02 +02:00
Onuray Sahin f0648ee52a
Merge branch 'develop' into feature/misleading_url_target 2020-04-24 11:24:39 +03:00
Valere eac9133bb1 update change log 2020-04-23 21:16:46 +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 25d2c2e2c6 Update design wait for self verification 2020-04-23 15:45:21 +02: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 671c1259af
Merge pull request #1239 from waylon531/develop 
Use a bigger thread pool
 2020-04-22 18:23:37 +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 8a4f0a0c00 KeyBackup / Use 4S if key in quadS 2020-04-20 19:21:44 +02:00
Benoit Marty a6368c473e Restart broken Olm sessions ([MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719)) 2020-04-20 18:07:14 +02:00
Onuray Sahin 754f220596
Merge branch 'develop' into feature/save_media_to_gallery 2020-04-20 11:21:14 +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
Benoit Marty e97c95f40a Fix issue with media path (Fixes #1227) 2020-04-16 16:41:45 +02:00
onurays 2b2e6dd6f8 Share menu item added to image media viewer. 2020-04-16 16:04:37 +03: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
Waylon Cude ec4458e84a
Updated CHANGES.md 
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-04-16 02:50:58 -07:00
Valere 8ae2f06044 Add change log 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 17ece54cb0 `mimetype` field is optional 2020-04-16 10:28:23 +02:00
Benoit Marty 634c8947bd
Merge branch 'develop' into refresh-summary 2020-04-15 17:29:08 +02:00
Benoit Marty 6201a9b8ef
Merge branch 'develop' into feature/fix_download_file 2020-04-15 16:52:40 +02:00
Benoit Marty 1981d2e9ac
Merge pull request #1233 from vector-im/feature/fix_local_echo_no_update 
Fix / sending event not always updating
 2020-04-15 16:51:16 +02:00
onurays f00db49bda Change password function implemented. 
Fixes #528
 2020-04-15 16:38:44 +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
Benoit Marty e26a0bc9ae Add Android SDK version 2020-04-15 12:57:15 +02:00
Benoit Marty 6dc517584f Fix merge issue 2020-04-15 12:56:33 +02:00
Valere 68ca0e9d4b Fix / sending event not always updating 2020-04-14 17:35:11 +02: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
onurays 7242cbda40 Catch network errors during file downloading. 
Fixes #1229
 2020-04-13 17:48:19 +03:00
Valere ccacd20428
Merge branch 'develop' into feature/verification_unified_emoji 2020-04-10 16:05:33 +02:00
Valere 68323057aa Update change log 2020-04-10 12:12:21 +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 34dec64d9c Fixes #1214 2020-04-08 17:56:12 +02:00
Valere aec49fe542 Change log 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
Christopher Rossbach 3ff5952417
Merge branch 'develop' into improvement-957-catchup-indicator-on-invite 2020-04-07 20:53:31 +02:00
Valere b480eb3688 Update change log 2020-04-07 19:20:49 +02:00
Christopher Rossbach 5521c094f7
fix typing difference 2020-04-07 17:50:01 +02:00