mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-23 11:16:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
20842 commits 161 branches 157 tags 267 MiB
Commit graph

12629 commits

Author SHA1 Message Date
Florian Renaud
eb12b1c99b Use StableUnstableId object for some event types 2022-11-25 14:42:45 +01:00
Florian Renaud
f4b948af9d Voice Broadcast - hide voice messages and state events behind hidden events 2022-11-25 14:42:45 +01:00
Onuray Sahin
8835e4d25e Create use case to decide to show alert. 2022-11-25 14:34:39 +03:00
Onuray Sahin
821a561235 Add timeout preference for alert. 2022-11-25 14:33:41 +03:00
Nikita Fedrunov
18bcc83a46
added read receipts for threads (#7474) 2022-11-25 09:49:06 +01:00
Benoit Marty
27419f0d33
Merge pull request #7583 from vector-im/feature/bma/remove_buidkite 
Remove usage of Buildkite.
 2022-11-24 18:51:22 +01:00
Benoit Marty
492e842410 Fix the fixture. 2022-11-24 18:05:24 +01:00
Valere
035b1ebedc
Merge pull request #7594 from vector-im/feature/bca/better_edit_validation 
Better edit (replace handling)
 2022-11-24 17:22:41 +01:00
Benoit Marty
8795ddb3c2 Add git commit sha to the version details (splash screen and preference screen) 2022-11-24 14:49:55 +01:00
Benoit Marty
9ca7415f5a Remove usage of Buildkite. 
Build number is just removed.
Related script will need to be updated separately.
 2022-11-24 14:49:55 +01:00
Florian Renaud
ae996ae197
Merge pull request #7623 from vector-im/dependabot/gradle/io.gitlab.arturbosch.detekt-1.22.0 
Bump io.gitlab.arturbosch.detekt from 1.21.0 to 1.22.0
 2022-11-24 13:38:37 +01:00
Onuray Sahin
59ac3b4f8b Update new strings of unverified sessions alert. 2022-11-24 15:26:59 +03:00
Valere
c06eca6936 Migration test and cleaning 2022-11-24 12:45:35 +01:00
Valere
e5d3206b6f code review 2022-11-24 12:45:35 +01:00
Valere
891709ef41 better replace handling 2022-11-24 12:45:35 +01:00
Benoit Marty
ebbfca4ffd Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire] 2022-11-24 11:06:00 +01:00
Jorge Martin Espinosa
452cfd3327
[RTE] Change layout based on plain text / rich text mode (#7621) 2022-11-23 16:56:37 +00:00
Onuray Sahin
0957b38329
Merge pull request #7546 from vector-im/feature/ons/toggle_ip_address_visibility 
Toggle IP address visibility (PSG-860)
 2022-11-22 22:41:21 +03:00
dependabot[bot]
1fe790e46f
Bump wysiwyg from 0.4.0 to 0.7.0 (#7572) 
* Bump wysiwyg from 0.4.0 to 0.6.0

Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.4.0 to 0.6.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/RELEASE.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.4.0...0.6.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update RTE library to 0.7.0

* Fix markdown -> html

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
 2022-11-22 19:12:07 +01:00
Onuray Sahin
abea9b686a Code review fixes. 2022-11-22 18:02:48 +03:00
Onuray Sahin
5eb786b55f Code review fixes. 2022-11-22 16:11:20 +03:00
Onuray Sahin
ab749eee6a Code review fixes. 2022-11-22 16:05:37 +03:00
Onuray Sahin
6c45490dd1 Code review fixes. 2022-11-21 18:44:45 +03:00
Onuray Sahin
664b0665cf
Merge pull request #7601 from vector-im/feature/ons/fix_truncated_italic_text 
Fix italic text is truncated when bubble mode and markdown is enabled (PSG-1006)
 2022-11-18 17:25:48 +03:00
Maxime NATUREL
14de485c67
Merge pull request #7566 from vector-im/fix/mna/missing-translation-reply-to 
Missing translations on "replyTo" messages (PSG-978)
 2022-11-18 14:39:18 +01:00
Onuray Sahin
7774f69317 Fix unit test. 2022-11-18 14:46:03 +03:00
Maxime NATUREL
cf5b96f9cf
Merge pull request #7605 from vector-im/fix/mna/anr-on-session-start 
ANR on session start when sending client info is enabled
 2022-11-18 09:38:39 +01:00
Jorge Martin Espinosa
7417241cd5
New RTE full screen implementation with BottomSheet (#7578) 
* RTE full screen editor using custom BottomSheet

* Fix formatting menu item dimensions

* Fix bug with insets when opening attachment menu

* Clear the EditText for plain text mode when a message is sent

* Set `MessageComposerMode.Special` as a sealed class

* Fix insets issue on landscape

* Fix small UI issues with rounded corners

* Use simplified icons for full screen and minimise
 2022-11-18 08:57:37 +01:00
Maxime NATUREL
74c945b7f0 Launching the sending of the client info in a dedicated coroutine to avoid ANR on application start 2022-11-17 17:43:53 +01:00
Onuray Sahin
ab94b21807 Fix the place of the span factory. 2022-11-17 15:58:42 +03:00
Onuray Sahin
a31a9ab521 Fix italic text is truncated when bubble mode and markdown is enabled. 2022-11-17 13:32:53 +03:00
Onuray Sahin
c788deacf5 Revert "Fix italic text is truncated when bubble mode and markdown is enabled." 
This reverts commit f63c6c328f.
 2022-11-17 13:26:09 +03:00
Onuray Sahin
f63c6c328f Fix italic text is truncated when bubble mode and markdown is enabled. 2022-11-17 13:19:40 +03:00
dependabot[bot]
e4caf7be81
Bump barista from 4.2.0 to 4.3.0 
Bumps [barista](https://github.com/AdevintaSpain/Barista) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/AdevintaSpain/Barista/releases)
- [Commits](https://github.com/AdevintaSpain/Barista/compare/4.2.0...4.3.0)

---
updated-dependencies:
- dependency-name: com.adevinta.android:barista
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-15 23:03:53 +00:00
Florian Renaud
54fcdcdb6d
Merge pull request #7588 from vector-im/feature/fre/voice_broadcast_recording_time 
Voice Broadcast - Add max length for recording
 2022-11-15 17:26:17 +01:00
Florian Renaud
6fc8c2cb80
Merge pull request #7582 from vector-im/feature/fre/voice_message_persist_playback_state 
Persist the playback state of voice messages across different screens
 2022-11-15 17:25:53 +01:00
Florian Renaud
3239ec5d1f replace negation "!" with ".not()" 2022-11-15 10:52:09 +01:00
Florian Renaud
8ea909970d Fix line length 2022-11-15 10:47:39 +01:00
Florian Renaud
361538254b Voice Broadcast - Add maximum length for recording 2022-11-15 09:26:47 +01:00
Florian Renaud
7349bc90c0 Pause playback instead of reset when recording a new voice message 2022-11-15 09:26:47 +01:00
Florian Renaud
dca379b80f Persist the playback state of voice messages across different screens 2022-11-15 09:26:35 +01:00
Florian Renaud
d9454af63e Stay in live when moving playback position in the same chunk 2022-11-15 00:30:55 +01:00
Florian Renaud
b85fcf9a00 Remove debounce on player buttons 2022-11-15 00:11:16 +01:00
Florian Renaud
403fd9260e improve boolean condition 2022-11-14 11:57:05 +01:00
Florian Renaud
44608f080c Improve logs 2022-11-14 10:55:48 +01:00
Florian Renaud
73d62c944c Emit first event on voice broadcast event flow 2022-11-14 10:27:30 +01:00
Florian Renaud
a3cd0ee790 Fix fetch playlist task getting stopped event from other voice broadcast 2022-11-14 10:27:30 +01:00
Florian Renaud
2d006f8725 Bind listener to live playback flag 2022-11-14 10:27:30 +01:00
Florian Renaud
5eb260e674 Unregister listeners on recording tile 2022-11-14 10:27:30 +01:00
Florian Renaud
6ee1e86951 Improve live indicator 2022-11-14 10:27:29 +01:00
Maxime NATUREL
fcfef53043 Search for the first occurrence (and not last) of breaking line just in case 2022-11-14 10:12:25 +01:00
Jorge Martin Espinosa
008432af36
Move TypingView into the timeline as another item (#7565) 
* Typing view as item in list

* Don't show TypingItem if we're showing a forward loader
 2022-11-10 17:28:03 +00:00
Maxime NATUREL
58d182aecb Adding unit tests on ProcessBodyOfReplyToEventUseCase 2022-11-10 17:28:30 +01:00
Benoit Marty
7481b5b342
Merge pull request #7515 from vector-im/dependabot/gradle/org.checkerframework-checker-3.27.0 
Bump checker from 3.11.0 to 3.27.0
 2022-11-10 16:29:25 +01:00
Benoit Marty
45e106d634
Merge pull request #7551 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.7.21 
Bump kotlin-reflect from 1.7.20 to 1.7.21
 2022-11-10 16:20:10 +01:00
Benoit Marty
8766e64bb6
Merge pull request #7561 from vector-im/dependabot/gradle/com.posthog.android-posthog-2.0.0 
Bump posthog from 1.1.2 to 2.0.0
 2022-11-10 16:19:28 +01:00
Maxime NATUREL
57e90aee83 Removing description parameter in startLiveLocation method of SDK to avoid translated strings in beacon events 2022-11-10 15:40:50 +01:00
Maxime NATUREL
235b629130 Use case to process formatted body of reply to events 2022-11-10 15:29:58 +01:00
Onuray Sahin
202c0c58ab Merge branch 'develop' into feature/ons/toggle_ip_address_visibility 
# Conflicts:
#	vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
 2022-11-10 17:01:50 +03:00
Maxime NATUREL
744b03a806
Merge pull request #7523 from vector-im/feature/mna/push-toggle-current-session 
Push notifications toggle: align implementation for current session (PSG-971)
 2022-11-10 13:44:49 +01:00
Florian Renaud
271fd05a1c
Merge pull request #7496 from vector-im/feature/fre/voice_broadcast_seek_to_live_update 
Voice Broadcast - Update seek bar position while playing
 2022-11-10 13:43:34 +01:00
Amit Kumar
c07b110b99
Add spannable tracking around SyncResponseHandler (#7514) 
* Add spannable tracking around SyncResponseHandler

* Update LICENSE header

* Refactor handleResponse and MetricsExtensions

* Update changelog.d

* Improve code docs and comments

* Check if Sentry is enabled before tracking
 2022-11-10 16:13:09 +05:30
Maxime NATUREL
6ec33f1264 Removing unused imports 2022-11-10 10:00:27 +01:00
Maxime NATUREL
ba5a433caf Adding distinctUntilChanged for flow of remote toggle via Pusher capability 2022-11-10 10:00:27 +01:00
Maxime NATUREL
163bf57fda Removing non necessary debug log 2022-11-10 10:00:27 +01:00
Maxime NATUREL
ced4bf3573 Adding unit tests on EnableNotificationsForCurrentSessionUseCase 2022-11-10 10:00:27 +01:00
Maxime NATUREL
b43c3a8502 Adding unit tests on UpdateEnableNotificationsSettingOnChangeUseCase 2022-11-10 10:00:27 +01:00
Maxime NATUREL
2eeb04426b Adding unit tests on DisableNotificationsForCurrentSessionUseCase 2022-11-10 10:00:27 +01:00
Maxime NATUREL
e5e971683b Adding unit tests on CanTogglePushNotificationsViaPusherUseCase 2022-11-10 10:00:27 +01:00
Maxime NATUREL
18929324fe Updating existing unit tests 2022-11-10 10:00:27 +01:00
Maxime NATUREL
6239b3e686 Adding some TODOs 2022-11-10 10:00:27 +01:00
Maxime NATUREL
24a5cfa9e5 Listen for pusher or account data changes to update the local setting 2022-11-10 10:00:27 +01:00
Maxime NATUREL
67d2a6faab Use the preference value to render the push notifications toggle 2022-11-10 10:00:26 +01:00
Maxime NATUREL
2941cfa329 Adding use cases to handle toggle of push notifications for current session 2022-11-10 10:00:26 +01:00
dependabot[bot]
e84c68495f
Bump posthog from 1.1.2 to 2.0.0 
Bumps [posthog](https://github.com/PostHog/posthog-android) from 1.1.2 to 2.0.0.
- [Release notes](https://github.com/PostHog/posthog-android/releases)
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-android/compare/1.1.2...2.0.0)

---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-09 23:03:47 +00:00
Onuray Sahin
b2589a1e4d Merge branch 'develop' into feature/ons/fix_device_manager_verified_desc 2022-11-09 19:05:07 +03:00
Onuray Sahin
b81fc4f8f1 Merge branch 'develop' into feature/ons/toggle_ip_address_visibility 
# Conflicts:
#	vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt
 2022-11-09 18:09:22 +03:00
Onuray Sahin
46c60f5897 Fix unit tests. 2022-11-09 16:57:16 +03:00
dependabot[bot]
25d33e9b1a
Bump kotlin-reflect from 1.7.20 to 1.7.21 
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.20 to 1.7.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-08 23:11:03 +00:00
Onuray Sahin
e888c11747 Lint fix. 2022-11-08 20:05:16 +03:00
Onuray Sahin
f6bc28f3bf Persist user preference of ip address visibility. 2022-11-08 17:43:48 +03:00
Onuray Sahin
0868869fe3 Toggle ip address on sessions overview screen. 2022-11-08 16:33:20 +03:00
Maxime NATUREL
fc24beaa68
Merge pull request #7456 from vector-im/feature/mna/session_manager_multi_signout 
[Session manager] Multi-session signout (PSG-857)
 2022-11-08 14:21:14 +01:00
Onuray Sahin
b5e8375592 Toggle ip address on other sessions screen. 2022-11-08 15:16:09 +03:00
Onuray Sahin
eed2a74d07 Toggle ip address on others section of the main screen. 2022-11-08 14:36:27 +03:00
Maxime NATUREL
6d2620815c Moving UI auth interceptor into use case 2022-11-07 16:52:41 +01:00
Onuray Sahin
456762a464 Add toggle ip address menu option. 2022-11-07 18:26:54 +03:00
Florian Renaud
c1dd66003a improve end of voice broadcast check 2022-11-07 16:11:10 +01:00
Florian Renaud
4e53366727 Fix default visibility of fast backward/forward buttons 2022-11-07 16:11:10 +01:00
Florian Renaud
9e83d88f08 Fix seek position when listening another voice broadcast 2022-11-07 16:11:10 +01:00
Florian Renaud
be18f4ec78 remove unused imports 2022-11-07 16:11:10 +01:00
Florian Renaud
305a362e9e Fix play action on other voice broadcast than the current one 2022-11-07 16:11:09 +01:00
Florian Renaud
6b57b1190c Make AudioMessagePlaybackTracker.Listener interface funny 2022-11-07 16:11:09 +01:00
Florian Renaud
226e2026a1 Remove item listeners 2022-11-07 16:11:09 +01:00
Florian Renaud
1c40f9c5e8 Minor cleanup 2022-11-07 16:11:09 +01:00
Florian Renaud
aa8eec221a Enable fast backward/forward buttons 2022-11-07 16:11:09 +01:00
Florian Renaud
c5e6eb0d0e Remove some logs 2022-11-07 16:11:09 +01:00
Florian Renaud
baa9cb39b0 Fix broken live listening 2022-11-07 16:11:09 +01:00
Benoit Marty
dff210c6c9
Merge pull request #7498 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.12.0 
Bump lazythreetenbp from 0.11.0 to 0.12.0
 2022-11-07 15:42:59 +01:00
Benoit Marty
cfd930f942
Merge pull request #7531 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-11-07 15:35:05 +01:00
Florian Renaud
7d51a26522 Decrease tick interval 2022-11-07 15:34:55 +01:00
Florian Renaud
436e76c756 Fix seek on paused state 2022-11-07 15:34:55 +01:00
Florian Renaud
b2f35fa135 Improve PlaybackTicker 2022-11-07 15:34:55 +01:00
Florian Renaud
a47e3c1233 Improve playing state updates 2022-11-07 15:34:55 +01:00
Florian Renaud
266236c1e5 set playlist.currentSequence null by default 2022-11-07 15:34:55 +01:00
Florian Renaud
43a112839f Fix seek when playlist is not loaded 2022-11-07 15:34:55 +01:00
Florian Renaud
a320155546 reset nextMediaPlayer when item has changed 2022-11-07 15:34:54 +01:00
Florian Renaud
a3cd861e15 Add isPreparingNextPlayer flag 2022-11-07 15:34:54 +01:00
Florian Renaud
b87b2cbb63 Remove useless method 2022-11-07 15:34:54 +01:00
Florian Renaud
37c75354be VoiceBroadcastPlayer - Reorganize some code 2022-11-07 15:34:54 +01:00
Florian Renaud
c85b159952 VoiceBroadcastPlayer - Extract some code to VoiceBroadcastPlaylist 2022-11-07 15:34:54 +01:00
Florian Renaud
dae4162e75 VoiceBroadcastPlayerImpl - use session coroutine scope 2022-11-07 15:34:54 +01:00
Florian Renaud
392fe6fa32 Transform TickListener to fun interface 2022-11-07 15:34:54 +01:00
Florian Renaud
d89ef6988b Improve player seek 2022-11-07 15:34:53 +01:00
Benoit Marty
7a24e16092
Merge pull request #7501 from SpiritCroc/duplicated-pill-fixes 
Fix duplicated pills when pills contain other spans
 2022-11-07 15:33:34 +01:00
Onuray Sahin
44c0378de8 Fix description of verified sessions. 2022-11-07 14:46:32 +03:00
Jorge Martin Espinosa
f0340d5ced
When joining a room, the message composer should be visible once the room loads (#7510) 2022-11-07 11:58:34 +01:00
Maxime NATUREL
45050e8216 Removing error formatting from ViewModel 2022-11-07 11:45:31 +01:00
Maxime NATUREL
5515cd379f Use SHOW_AS_ACTION_IF_ROOM tag 2022-11-07 11:09:42 +01:00
Maxime NATUREL
d2d9da3ef7 Exclude the current session from other sessions and security recommendation screens 2022-11-07 11:09:42 +01:00
Maxime NATUREL
ef5aaf7525 Fix forbidden usage of AlertDialog 2022-11-07 11:09:42 +01:00
Maxime NATUREL
db42d1c01c Fix post rebase unit tests 2022-11-07 11:09:42 +01:00
Maxime NATUREL
4b0b335a68 Fixing code quality issues 2022-11-07 11:09:42 +01:00
Maxime NATUREL
e0d511a488 Fixing a name of a mocked component 2022-11-07 11:09:42 +01:00
Maxime NATUREL
a3df90ae3e Adding unit tests about multi signout action for devices view model 2022-11-07 11:09:42 +01:00
Maxime NATUREL
880ee4058c Adding unit tests about reAuth actions for devices view model 2022-11-07 11:09:42 +01:00
Maxime NATUREL
5bcf2ac51e Adding unit tests for other sessions list view model 2022-11-07 11:09:41 +01:00
Maxime NATUREL
a968ac08c3 Adding unit tests for signout sessions use case 2022-11-07 11:09:41 +01:00
Maxime NATUREL
727c7462df Adding confirmation dialog before signout process 2022-11-07 11:09:41 +01:00
Maxime NATUREL
0f8e5919da Calling signout multi sessions use case in main screen for other sessions 2022-11-07 11:09:41 +01:00
Maxime NATUREL
1bda54323a Calling signout multi sessions use case in other sessions screen 2022-11-07 11:09:41 +01:00
Maxime NATUREL
7e836c0e97 Updating the action title to include sessions number 2022-11-07 11:09:41 +01:00
Maxime NATUREL
810c93cef9 Handling press on multi signout action from header menu in other sessions section 2022-11-07 11:09:41 +01:00
Maxime NATUREL
ae4a728358 Handling press on multi signout action in other sessions list screen 2022-11-07 11:09:41 +01:00
Maxime NATUREL
1ed92e5215 Adding overflow menu capability in sessions list header view 2022-11-07 11:09:41 +01:00
Maxime NATUREL
f45cc715d1 Adding new menu entry for multi signout 2022-11-07 11:09:41 +01:00
bmarty
46260b5768 Sync analytics plan 2022-11-07 00:04:35 +00:00
Florian Renaud
6d850b3030 Create VoiceBroadcast model with roomId and eventId 2022-11-04 11:36:15 +01:00
Florian Renaud
b0a31304a1 Update seek bar tick progress while playing 2022-11-04 11:36:14 +01:00
Maxime NATUREL
4621488f21
Merge pull request #7476 from vector-im/fix/mna/push-toggle-check-support 
[Session manager] Hide push notification toggle when there is no server support (PSG-970)
 2022-11-04 09:19:04 +01:00
Maxime NATUREL
e9daef97b6 Fix order of check to get notification status 2022-11-03 11:27:02 +01:00
dependabot[bot]
bb02209537
Bump checker from 3.11.0 to 3.27.0 
Bumps [checker](https://github.com/typetools/checker-framework) from 3.11.0 to 3.27.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.11.0...checker-framework-3.27.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-02 23:10:39 +00:00
Florian Renaud
481388ed32 Fix line length 2022-11-02 17:06:24 +01:00
Florian Renaud
b41346cdce Improve player transitions 2022-11-02 17:06:24 +01:00
Florian Renaud
eb61a23bf6 Temporary disable seekBar if playing state is paused or idle 2022-11-02 17:06:24 +01:00
Florian Renaud
7d3f6365e2 Use sum() instead of reduce operator 2022-11-02 17:06:24 +01:00
Florian Renaud
bc3fe4e5f6 Minor cleanup 2022-11-02 17:06:24 +01:00
Florian Renaud
9219043579 VoiceBroadcastPlayer - seek implementation 2022-11-02 17:06:24 +01:00
Florian Renaud
a851e5aa85 VoiceBroadcastPlayer - Add seek control views 2022-11-02 17:06:23 +01:00
Jorge Martín
5c55a3261f Merge remote-tracking branch 'origin/develop' into resilience-rc 2022-11-02 16:00:34 +01:00