Commit graph

591 commits

Author SHA1 Message Date
Benoit Marty
4cdf55e7dd Prevent Alerts to be displayed in the automatically displayed analytics opt-in screen (#4933) 2022-01-13 21:53:42 +01:00
Adam Brown
b62693cbb0 adding changelog entry 2022-01-13 17:28:27 +00:00
Benoit Marty
f2165201eb Remove unused module matrix-sdk-android-rx and do some cleanup 2022-01-13 17:54:25 +01:00
fedrunov
d92e0e48f6 code review changes 2022-01-13 17:50:38 +01:00
Benoit Marty
457534b1df
Merge branch 'develop' into feature/bca/spaces_fix_3932 2022-01-13 12:04:47 +01:00
Benoit Marty
1b24b9d764
Merge pull request #4895 from vector-im/feature/bma/empty_state_key
Avoid allowing null String for state_key.
2022-01-13 12:00:48 +01:00
Benoit Marty
a16a6a6eeb
Merge pull request #4935 from vector-im/feature/bma/fix_legals
Fix #4919
2022-01-13 11:59:46 +01:00
Benoit Marty
5095514ecd
Merge pull request #4928 from vector-im/feature/aris/stuck_local_echo_issue_516
Potential fix stuck local echo events at the bottom of the screen
2022-01-13 10:44:56 +01:00
Benoit Marty
18359fedb3 Fix #4919 2022-01-12 18:08:37 +01:00
Benoit Marty
f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement
Trying to fix integration tests
2022-01-12 17:11:16 +01:00
ariskotsomitopoulos
b92cb753f9 Fix stuck local echo events at the bottom of the screen 2022-01-12 15:31:54 +02:00
Benoit Marty
ea6347b1c7 Add signing config for the release buildType. No secret added
To be able to test the release build sooner during the release process.
2022-01-12 14:07:51 +01:00
Benoit Marty
7eb7d51759 changelog 2022-01-12 12:48:13 +01:00
Benoit Marty
a35fec245d Add changelog 2022-01-12 12:13:11 +01:00
Benoit Marty
12018aaee5 Changelog 2022-01-11 17:22:06 +01:00
fedrunov
9ec662ccdc replace "kick" with "remove" 2022-01-11 16:21:42 +01:00
Valere
6b05e7a6bb Support misconfigured room encryption 2022-01-11 14:56:31 +01:00
Onuray Sahin
9ea30445ef Merge branch 'develop' into feature/ons/static_location
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
2022-01-11 14:42:11 +03:00
Valere
bf447afa5a
Remove deprecated restricted lab option (#4889)
Remove deprecated restricted lab option
2022-01-11 09:01:37 +00:00
Benoit Marty
008034895b
Merge pull request #4893 from vector-im/feature/ons/fix_create_poll_recyclerview
Workaround to not to reuse poll option cells
2022-01-11 10:00:16 +01:00
Benoit Marty
3bdb05f7b4 Changelog 2022-01-10 17:49:47 +01:00
Valere
ff4bbf0a8a Add "Create room" shortcut in Explore Space screen 2022-01-10 17:00:32 +01:00
Onuray Sahin
5feafbdbf1 Workaround to not to reuse poll option cells. 2022-01-10 17:28:07 +03:00
Benoit Marty
ae8d1d1429 Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 2022-01-10 15:10:08 +01:00
Benoit Marty
f368ec15d8
Merge pull request #4892 from vector-im/feature/bma/analytics_opt_in
Revert "Disable automatic opt-in screen display."
2022-01-10 15:03:19 +01:00
Benoit Marty
5d70aa9947 Changelog 2022-01-10 14:33:47 +01:00
ariskotsomitopoulos
71fbc3c5c7 - Do not add GitHub comments on successful ktlint runs
- Remove already existing comments when ktlint succeed
2022-01-10 13:07:18 +02:00
Benoit Marty
d14dadde27
Merge branch 'develop' into feature/dla/fix_reply_and_quote_newlines 2022-01-07 14:43:41 +01:00
Benoit Marty
bcebfff1a2
Merge pull request #4864 from vector-im/feature/aris/linter_github_actions_improvement
Enhance Linter Github Actions Reporting
2022-01-07 14:25:29 +01:00
Benoit Marty
401479f140 Since the change are in the SDK, use the .removal extension for a better future changelog. 2022-01-06 21:07:57 +01:00
Benoit Marty
b46b76c22a
Merge pull request #4753 from vector-im/feature/fre/tagged_events
Support tagged events in Room Account Data (MSC2437)
2022-01-06 21:06:44 +01:00
Benoit Marty
3f9bea308a
Merge pull request #4872 from vector-im/feature/adm/enabling-ftue-already-have-account
Enabling FTUE_AUTH onboarding variant
2022-01-06 20:57:51 +01:00
Benoit Marty
b852b9de9c
Merge pull request #4871 from vector-im/feature/nfe/qr_scanner_toolbar
Toolbar is added to a views with QR code scan
2022-01-06 20:55:06 +01:00
Adam Brown
0ea7fc2f10 adding changelog entry 2022-01-06 17:39:17 +00:00
Adam Brown
f24c962a4a
Merge pull request #4668 from vector-im/feature/adm/i-already-have-an-account
FTUE Auth - I already have an account
2022-01-06 17:11:44 +00:00
fedrunov
6bfd9d07a9 Toolbar is added to a views with QR code scan 2022-01-06 17:11:23 +01:00
Benoit Marty
296929e179
Merge pull request #4790 from vector-im/feature/adm/emoji-recycling
Timeline recycling crash
2022-01-06 14:55:29 +01:00
Adam Brown
443d15518f adding changelog entry 2022-01-06 10:03:13 +00:00
ariskotsomitopoulos
33a4eac7d2 - Fix github actions ktlint reports
- Publish results on PR via commenting
- Support for all modules along with tests
- Code format & emoticons
2022-01-06 00:26:47 +02:00
ariskotsomitopoulos
6a24e0286e Increase adbtimeout to prevent ShellCommandUnresponsiveException exception 2022-01-05 23:45:07 +02:00
Benoit Marty
1490854b4c
Merge pull request #4799 from vector-im/feature/adm/inconsistent-outgoing-call-output
Outgoing call ringtone using wrong audio device
2022-01-05 22:05:23 +01:00
Benoit Marty
17e485fde1
Merge pull request #4826 from vector-im/feature/bma/nick_color_final
Nick color
2022-01-05 22:01:03 +01:00
Valere
e5431d9fb4 Track decryption failures 2022-01-05 16:43:05 +01:00
Benoit Marty
608e01abf1 Merge branch 'develop' into feature/bma/nick_color_final 2022-01-05 16:33:13 +01:00
Adam Brown
0df07d0a1e adding changelog entry 2022-01-05 09:58:47 +00:00
Benoit Marty
5fc1efb542
Merge pull request #4852 from vector-im/feature/bma/tooltip
Add tooltip to explain what are the actions behind the icons
2022-01-05 09:47:12 +01:00
Florian Renaud
f008abde4f Merge branch 'develop' into feature/fre/tagged_events 2022-01-04 17:23:04 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty
0797860e4f Update changelog 2022-01-04 16:02:16 +01:00
Benoit Marty
39ff9da3c1
Merge pull request #4846 from vector-im/feature/dla/fix-unread-message-indicator-no-messages
Fix unread messages indicator on room list if no messages
2022-01-04 15:57:26 +01:00
Claire Gizard
63c63bc462 Update error message when joining room 2022-01-04 13:49:18 +01:00
David Langley
9f13a9df54 If latestPreviewableEvent is null we should return false(no messages in room). 2022-01-04 12:20:56 +00:00
Benoit Marty
279f9e00a3
Merge pull request #4837 from vector-im/feature/bma/safe_epoxy_char_sequence
Safe epoxy char sequence
2022-01-04 09:53:49 +01:00
Benoit Marty
d670d3e872
Merge pull request #4405 from vector-im/feature/fga/timeline_chunks_rework
Feature/fga/timeline chunks rework
2022-01-03 20:20:42 +01:00
ganfra
91215854f4 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2022-01-03 16:07:05 +01:00
ganfra
12b775c26d Timeline : clean after PR reviews 2022-01-03 16:06:48 +01:00
Benoit Marty
4642299572 Changelog 2022-01-03 14:30:14 +01:00
Tobias Preuss
74363ff823 Let ShareCompat.IntentBuilder create the chooser intent for sharing content.
+ Although the system's intent chooser normally takes care of cases when
  no app is found we still keep the safeguard here to be prepared for
  exotic devices behaving different.

Signed-off-by: Tobias Preuss <tobias.preuss@googlemail.com>
2021-12-31 22:37:42 +01:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths 2021-12-31 16:41:06 +01:00
Onuray Sahin
4d6eec8972 Rate limited maptiler key is added. 2021-12-31 15:12:46 +03:00
Benoit Marty
1d3cc52991 Changelog new management 2021-12-31 13:05:06 +01:00
Benoit Marty
ce0a582b3e
Merge pull request #4823 from vector-im/feature/ons/attachment_picker
Attachment Picker UI Improvements
2021-12-31 11:43:49 +01:00
Onuray Sahin
cc8da82d02 New attachment picker implemented. 2021-12-30 16:28:50 +03:00
Benoit Marty
9b94f1e370 Changelog for #4747 2021-12-30 12:42:39 +01:00
Benoit Marty
5407c84b2f
Merge pull request #4783 from vector-im/feature/adm/unable-to-change-avatar
Unable to change avatar due to `NetworkOnMainThread`
2021-12-30 12:30:18 +01:00
Benoit Marty
f124eba665
Merge pull request #4810 from vector-im/feature/adm/voip-mute-notification
Fixing duplicated/empty notifications when joining/muting/leaving a VOIP call
2021-12-30 11:31:06 +01:00
Benoit Marty
abcdfc6f73
Merge pull request #4758 from vector-im/feature/adm/emoji-inconsistencies
Wrong emojis in composer
2021-12-30 10:34:22 +01:00
Benoit Marty
3abba1932f
Workaround to fetch all the pending toDevice events from a Synapse homeserver (#4614)
Workaround to fetch all the pending toDevice events from a Synapse homeserver

Co-authored-by: Valere <valeref@matrix.org>
2021-12-30 10:28:52 +01:00
Adam Brown
a15fefc718 adding changelog entry 2021-12-24 11:55:55 +00:00
Adam Brown
ffdd10b5bf adding changelog entry 2021-12-22 15:59:09 +00:00
Adam Brown
a764e02f8a adding changelog entry 2021-12-21 09:35:56 +00:00
Adam Brown
a9cf7b3676 adding changelog entry 2021-12-17 16:55:30 +00:00
Florian Renaud
706c5b2b32 Add tagged events model 2021-12-17 15:54:20 +01:00
ganfra
461beda634
Merge pull request #4742 from vector-im/feature/aris/fix_immutable_model_crash
Fix crash ImmutableModelException
2021-12-17 15:30:19 +01:00
ganfra
e155eefb7b
Merge pull request #4748 from vector-im/feature/adm/late-emoji-initialisation
Unable to render messages
2021-12-17 12:35:37 +01:00
ganfra
ac65942c28
Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix
Emojis in emotes causing crashes on Android 12+
2021-12-17 11:47:16 +01:00
Adam Brown
e1eafd2c64 adding changelog entry 2021-12-17 09:26:10 +00:00
Adam Brown
9e2fb1366f
Update changelog.d/4743.bugfix
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2021-12-17 09:22:12 +00:00
ClaireGizard
ca58a04f57
Small UI fix in room member profile hearder (#4700)
Small ui fix on room member profile name

Co-authored-by: Claire Gizard <cgizard>
2021-12-16 21:10:03 +01:00
ariskotsomitopoulos
cabf12289b Add changelog 2021-12-16 20:39:21 +02:00
Adam Brown
049cad7d2c adding changelog entry 2021-12-16 18:37:03 +00:00
Benoit Marty
3b35be510f
Merge pull request #4729 from vector-im/feature/adm/avoid-leaking-window-when-showing-loading
Avoid leaking Activity Window when showing loading dialog
2021-12-16 11:07:23 +01:00
Benoit Marty
818a8898b3 Call banner: center text vertically 2021-12-15 22:19:23 +01:00
Adam Brown
eb9c46b9a2 adding changelog entry 2021-12-15 18:17:04 +00:00
Adam Brown
8c913d29cb adding changelog entry 2021-12-15 17:35:27 +00:00
David Langley
20b5742227 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_reply_and_quote_newlines 2021-12-14 13:46:45 +00:00
Benoit Marty
5dfe24ca45 Towncrier 2021-12-14 14:39:39 +01:00
Benoit Marty
6d2163bdf4 Add changelog 2021-12-14 11:34:15 +01:00
Benoit Marty
fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys
Fallback keys implementation
2021-12-13 23:36:20 +01:00
Benoit Marty
48fa411d83
Merge pull request #4698 from vector-im/feature/bma/emoji_hotfix
Emoji fix
2021-12-13 23:15:46 +01:00
Benoit Marty
2c81e7ea08
Merge pull request #4601 from vector-im/feature/aris/search_no_data_displayed_4600
Fix issue 4600 that search results sometimes are not displayed properly
2021-12-13 23:01:03 +01:00
Benoit Marty
3719551913
Merge pull request #4693 from SpiritCroc/spaceChildIds
Fix possible crash when having identical subspaces in multiple root spaces
2021-12-13 22:59:57 +01:00
Benoit Marty
78a7a61d07 Changelog 2021-12-13 20:31:52 +01:00
Onuray Sahin
f028f9836b Merge branch 'develop' into feature/ons/poll_timeline
* develop: (49 commits)
  Update changelog.d/4592.bugfix
  Remove jcenter from here, let's see what the CI will say
  Common struct for each maven repo
  Rename the file to group them
  Add changelog file
  Revert PR 4592 for devtools
  Enhance include groups implementation by decoupling them to a separate file
  Cleanup
  Legals: improve API to get homeserver terms
  Legals: update setting icon
  Auto-review
  Add a help section in the settings.
  Changelog
  Color for links
  Use same height than the loading item to avoid dynamic resizing
  Legals: only display external URLs.
  Legals: Move the 2 copyrights items to the new legal screen
  Add some space between the 2 TextViews, and improve the layout
  Legals: Move the 3 element links to the new legal screen
  Rename some classes
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
2021-12-13 17:44:21 +03:00
Benoit Marty
406881c8a7
Merge pull request #4689 from vector-im/feature/aris/dev_tools_fix_4592
Feature/aris/dev tools fix 4592
2021-12-13 11:37:53 +01:00
Benoit Marty
3620a265d0
Merge pull request #4650 from vector-im/feature/bma/id_ref
Cleanup id ref. Use type views instead.
2021-12-13 11:32:18 +01:00
Benoit Marty
a6dec7b9cb
Merge pull request #4670 from vector-im/feature/bma/safer_dependencies
Safer dependencies
2021-12-13 11:30:15 +01:00
Aris Kotsomitopoulos
2fbcc96b4d
Update changelog.d/4592.bugfix
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2021-12-13 11:06:59 +02:00
SpiritCroc
9a84c45ccd Changelog 2021-12-12 12:20:33 +01:00
ariskotsomitopoulos
6c296d53bf Add changelog file 2021-12-10 19:46:54 +02:00
Benoit Marty
7f7199abd4 Add a help section in the settings. 2021-12-10 15:35:46 +01:00
Benoit Marty
17c4c1e9b8 Changelog 2021-12-10 15:35:46 +01:00
Ekaterina Gerasimova
8fefee9b02 Fix graphql warning in issue automation workflow
Fixes #4671
2021-12-10 08:52:08 +00:00
Benoit Marty
01cc7b7264 Changelog 2021-12-10 00:07:27 +01:00
daniellekirkwood
2c8cc3e16d
Add automation to move messages bubbles issues to the message bubbles board (#4667)
* Add automation to move message bubbles issues to bubbles board

* Add changelog entry

Changelog entry to note new automation to move message bubbles issues to message bubbles board
2021-12-09 15:20:10 +00:00
Onuray Sahin
b2e599ea2b Merge branch 'develop' into feature/ons/poll_timeline
* develop: (21 commits)
  Remove automation for new Delight board
  Remove automation for old Delight board
  Bump gradle from 7.0.3 to 7.0.4
  Bump realm-gradle-plugin from 10.8.1 to 10.9.0
  Bump libphonenumber from 8.12.38 to 8.12.39
  Bump mavericks from 2.4.0 to 2.5.0
  removing no longer possible branches
  adding a consistent padding to allow message types to avoid touching the side gutter
  Upgrade OLM to v3.2.7 and get it from our maven repository.
  removing manual send status spacing - it's no longer needed as the send status is always present (but invisible)
  removing manual end alignment for voice messages as send status gutter is now always present
  forcing the send spacing to always be taking into account - ensures all message lengths are consistent
  capping the preview image url based on the height - stops large screens eg tablets from attempting to fill the screen
  matching iOS max line rules for the preview description
  using themed colours for the close button
  limiting title to avoid overlapping with close icon
  flattening preview url view layout with custom view to reduce view hierarchy
  adding changelog entry
  updating url preview to match new designs
  removing now longer needed Mode argument
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_base.xml
2021-12-09 15:38:15 +03:00
Onuray Sahin
c603135398 Code review fixes. 2021-12-07 19:05:36 +01:00
Onuray Sahin
0f11e498a0 Changelog added. 2021-12-07 20:13:45 +03:00
Benoit Marty
7cf92ec17d
Merge pull request #4610 from vector-im/feature/adm/url-preview
Updating URL preview design
2021-12-07 17:35:50 +01:00
Benoit Marty
d3a1746475 Use id from existing views instead of "hard-coded" values
And improve our extension
2021-12-07 16:56:27 +01:00
Benoit Marty
892d70812f Upgrade OLM to v3.2.7 and get it from our maven repository. 2021-12-07 14:50:25 +01:00
Adam Brown
6a749f106d adding changelog entry 2021-12-07 11:32:33 +00:00
Benoit Marty
796fa08418 Changelog 2021-12-06 22:37:51 +01:00
Benoit Marty
f1d8b9e974
Merge pull request #4637 from vector-im/feature/dla/outgoing_pstn_call_fails
Feature/dla/outgoing pstn call fails
2021-12-06 21:37:11 +01:00
David Langley
03be698a7e Fix waring for state is not dialing or connected 2021-12-06 13:46:56 +00:00
Benoit Marty
1f58913b53
Merge pull request #4626 from vector-im/feature/adm/feature-flags
Feature flags base
2021-12-03 17:38:25 +01:00
Benoit Marty
e60d053f84
Merge pull request #4568 from vector-im/feature/fga/fix_sdk_integration_tests
Feature/fga/fix sdk integration tests
2021-12-03 17:11:33 +01:00
Adam Brown
8a0fe41b80 adding changelog entry 2021-12-03 15:40:53 +00:00
David Langley
90f2e2c32e Create 4621.bugfix 2021-12-03 11:17:47 +00:00
Ekaterina Gerasimova
3778603c4d Issue workflow: improve naming for jobs 2021-12-03 10:01:25 +00:00
Benoit Marty
3644e5d755
Merge pull request #4611 from vector-im/feature/bma/devx_view_ids
Devx view ids
2021-12-02 19:48:35 +01:00
Adam Brown
c6f4bba1a4 adding changelog entry 2021-12-02 14:39:27 +00:00
Benoit Marty
0b62c4ec6b Changelog 2021-12-01 22:59:20 +01:00
Benoit Marty
fa256cca25
Merge pull request #4603 from vector-im/feature/aris/remove_not_needed_job_cancel_4602
There is no need to call job.cancel() when we are using viewModelScope()
2021-12-01 18:24:06 +01:00
Benoit Marty
d57240e3f5 towncrier 2021-12-01 16:58:42 +01:00
Benoit Marty
84f7eb29e0 Add robustness when getting data from cursors.
Use androidx.core.database extension for better nullability check, and ignore uncomplete data.
2021-12-01 16:09:12 +01:00
ariskotsomitopoulos
9f1e327fa5 There is no need to call job.cancel() when we are using viewModelScope() 2021-12-01 13:15:03 +00:00
ariskotsomitopoulos
7fedcbb998 Fix issue 4600 that search results sometimes are not displayed properly 2021-12-01 13:04:20 +00:00
Benoit Marty
3a8fd42513
Merge pull request #4558 from vector-im/feature/adm/voice-draft
Adding support for voice drafts
2021-11-30 20:44:49 +01:00
Benoit Marty
02a609164c
Merge pull request #4592 from vector-im/feature/aris/epoxy_controller_init_improvement
Feature/aris/epoxy controller init improvement
2021-11-30 18:50:32 +01:00
ariskotsomitopoulos
ff0cf9b394 Add changelog file 2021-11-30 17:16:53 +00:00
Benoit Marty
3d5d9ad154 Iterate on the consent dialog of the identity server. 2021-11-30 15:46:27 +01:00
ganfra
51f46d199f Tests: clean after review 2021-11-30 14:15:18 +01:00
Adam Brown
cdb5376a19 Adding support for voice drafts
- introduces a new Voice draft and sender mode type
- initializes the voice recorder with a previously recorded file (the draft)
- renames RecordingUiStates to map to their actual UI states
2021-11-30 10:22:25 +00:00
Benoit Marty
df23cc4e09
Merge pull request #4567 from vector-im/feature/adm/stuck-voip
Always showing hang up button in VOIP calls
2021-11-29 16:24:16 +01:00
Benoit Marty
7beec1c726
Merge pull request #4557 from vector-im/feature/adm/voice-keep-screen-on
Keep device screen on during voice message playback and recording
2021-11-29 14:29:30 +01:00
Benoit Marty
b59ae53805
Merge pull request #4556 from vector-im/feature/adm/voice-rotation
Supporting rotation during voice recordings
2021-11-29 11:40:55 +01:00
Benoit Marty
b889641f2b
Merge pull request #4565 from vector-im/feature/adm/dismissing-listening-for-notification-on-signout
Dismissing Fdroid variant `Listening for notifications` on sign out
2021-11-29 11:33:53 +01:00
Adam Brown
258d64a41e adding changelog entry 2021-11-26 16:53:57 +00:00
Adam Brown
cc9fb326dd adding changelog entry 2021-11-26 12:07:19 +00:00
Adam Brown
a0ffc5988f adding changelog entry 2021-11-26 09:57:58 +00:00
Adam Brown
5ed765999a adding changelog entry 2021-11-24 16:37:53 +00:00
Adam Brown
6d2dc20ad1 adding changelog entry 2021-11-24 16:24:39 +00:00
Adam Brown
8a8a5bfa50 adding changelog entry 2021-11-24 11:00:43 +00:00
Adam Brown
72bc442fca adding changelog entry 2021-11-23 18:12:49 +00:00
Benoit Marty
c72dd5eec6
Merge pull request #4507 from vector-im/feature/bca/crypto_better_logs
Improve crypto log to debug UISI
2021-11-23 15:35:28 +01:00
Benoit Marty
eba6ae592b
Merge pull request #4539 from vector-im/feature/fre/fix_duplicated_settings
Remove duplicated settings declaration
2021-11-22 19:15:08 +01:00
David Langley
460596d6b3 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_reply_and_quote_newlines 2021-11-22 17:19:23 +00:00
David Langley
0efe4ef16a Create 4540.bugfix 2021-11-22 17:03:47 +00:00
Florian Renaud
6c81bf6ee8 Remove duplicated settings declaration 2021-11-22 18:03:07 +01:00