Commit Graph

3395 Commits

Author SHA1 Message Date
onurays 2b2e6dd6f8 Share menu item added to image media viewer. 2020-04-16 16:04:37 +03:00
Benoit Marty febadcc4f6
Merge pull request #1238 from vector-im/feature/thumbnail_info
`mimetype` field is optional
2020-04-16 10:57:29 +02:00
Benoit Marty 17ece54cb0 `mimetype` field is optional 2020-04-16 10:28:23 +02:00
Benoit Marty da04a74350
Merge pull request #1143 from MatMaul/refresh-summary
Refresh the whole notifs when cleaning one so the summary get updated
2020-04-15 17:29:36 +02:00
Benoit Marty 634c8947bd
Merge branch 'develop' into refresh-summary 2020-04-15 17:29:08 +02:00
Benoit Marty f6f6fa99fb
Merge pull request #1223 from vector-im/feature/cross_signing_as_task
Make initialize cross signing as a task
2020-04-15 17:21:25 +02:00
Benoit Marty dcfbfc4981
Merge pull request #1230 from vector-im/feature/fix_download_file
Catch network errors during file downloading.
2020-04-15 16:54:31 +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
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
onurays b4a3eb2cb3 Fix return the exception instead of empty one. 2020-04-15 16:39:41 +03: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 391d3cb6b5
Merge pull request #1186 from duncanturk/improvement-957-catchup-indicator-on-invite
Fix #957 catchup indicator on invite
2020-04-15 15:02:16 +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 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 f2bca51046
Merge pull request #1232 from vector-im/feature/translations
string sync
2020-04-15 14:24:39 +02:00
Benoit Marty 6751d88ade Remove .idea exclusion 2020-04-15 13:00:03 +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
Benoit Marty 24d0cdef1f Add missing changes of SDK version and build tools 2020-04-15 12:53:28 +02:00
Benoit Marty 6639f89a68 Simpler code 2020-04-15 12:53:08 +02:00
Benoit Marty 0c0e9521f5 Fix lint issue 2020-04-15 09:50:25 +02:00
Valere f2b684aa9e Fix / user and self signing failing
bad copy paste
2020-04-14 18:23:20 +02:00
Valere 68ca0e9d4b Fix / sending event not always updating 2020-04-14 17:35:11 +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
Benoit Marty b8cb0588fe Add new resources 2020-04-14 17:06:05 +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
onurays f97e08b4e5 Remove .gitignore which belongs to another PR. 2020-04-14 13:12:17 +03:00
onurays 7242cbda40 Catch network errors during file downloading.
Fixes #1229
2020-04-13 17:48:19 +03:00
Valere 9e3011d4c8 Make initialize cross signing as a task 2020-04-10 17:04:34 +02:00
Valere eb50256af7
Merge pull request #1222 from vector-im/feature/verification_unified_emoji
Uniform emoji representation for all platform
2020-04-10 16:05:42 +02:00
Valere ccacd20428
Merge branch 'develop' into feature/verification_unified_emoji 2020-04-10 16:05:33 +02:00
Valere ac46fe9e16
Merge pull request #1218 from vector-im/feature/scan_confirm_update
Feature/scan confirm update
2020-04-10 16:05:02 +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 68323057aa Update change log 2020-04-10 12:12:21 +02:00
Valere 5081361c2d Update Scan confirm flow 2020-04-10 12:12:06 +02:00
Valere 3ba619d45c
Merge pull request #1215 from vector-im/feature/ssss_and_backup
Fixes #1214
2020-04-10 12:10:42 +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 ede899d78e Fix / Bad smiley emojii 2020-04-10 11:09:16 +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