Šimon Brandner
ca6ed64811
$roomlist-header-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
79efd61b66
$roomsublist-divider-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
36531be8ca
$roomtile-preview-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Germain Souquet
5a7c0d87b6
Rename ReplyThread to ReplyChain to avoid confusion with m.thread
2021-10-15 17:42:44 +01:00
Šimon Brandner
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4
2021-10-15 16:23:40 +02:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview ( #18958 ) ( #6953 )
...
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
Šimon Brandner
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:23:32 +02:00
Travis Ralston
71c5b02390
Add feature flag for polls and placeholder dialog
...
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
2021-10-12 15:13:56 -06:00
Michael Telatynski
d050c00703
Fix room list skeleton ui for narrow room list
2021-10-12 10:30:36 +01:00
Michael Telatynski
e54d803343
Tweak skeleton UI height to be more reasonable
2021-10-11 10:50:33 +01:00
Germain Souquet
822f73edf7
Remove stale comments in _RoomSublist.scss
2021-10-07 17:28:37 +01:00
Germain
57b919b10a
Delete fixed headerContainer height
...
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-10-07 16:51:39 +01:00
Germain Souquet
c009d15176
Allow the header container to collapse on itself when room list not minimised
2021-10-07 10:57:23 +01:00
Šimon Brandner
8a9c493f3a
Use correct color for a selected room in the
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:40:18 +02:00
Germain Souquet
bb7319f632
move timestamp to the right in thread's context
2021-09-24 11:44:11 +01:00
Germain Souquet
dc979a33a1
Fix spacing for message composer buttons
2021-09-22 11:55:25 +01:00
Travis Ralston
30972c597d
Merge pull request #6777 from robintown/room-list-scroll-jumps
...
Fix room list scroll jumps
2021-09-14 13:40:20 -06:00
Travis Ralston
fdb004b4e8
Merge pull request #6785 from robintown/message-bubble-misc
...
Fix various message bubble alignment issues
2021-09-14 13:26:03 -06:00
Travis Ralston
c3ad978941
Merge pull request #6795 from robintown/message-bubble-font-size
...
Make message bubble font size consistent
2021-09-14 13:25:28 -06:00
Robin Townsend
9b3da61ae4
Remove unnecessary unset
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:37:45 -04:00
Robin Townsend
8824b12064
Fix alignment of sender name in message bubble replies
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:35:51 -04:00
Robin Townsend
2c0835ed9b
Add comments to message bubble magic numbers
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 11:27:03 -04:00
Robin Townsend
35171ccd23
Merge branch 'develop' into message-bubble-misc
2021-09-14 11:00:55 -04:00
Dariusz Niemczyk
527e1eb462
Fix autocomplete not having y-scroll
...
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.
Fix https://github.com/vector-im/element-web/issues/18997
2021-09-14 14:45:47 +02:00
Robin Townsend
465ce0820d
Make message bubble font size consistent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-13 23:32:01 -04:00
Robin Townsend
8099791b32
Fix various message bubble alignment issues
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-11 11:43:36 -04:00
Robin Townsend
07eafb9e3d
Fix room list scroll jumps
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-09 20:07:51 -04:00
Germain Souquet
aa53444267
Improve narrow composer usability
2021-09-09 13:27:25 +01:00
Germain Souquet
bbf66a0011
Make label clickable on narrow mode context menu
2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe
Fix PR UI defects
2021-09-07 16:02:26 +01:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer""
2021-09-06 22:11:35 -06:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer"
2021-09-06 22:08:50 -06:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533
2021-09-07 05:07:00 +01:00
Germain
e7cfa4816e
Merge pull request #6582 from SimonBrandner/fix/bubble-highlight/18295
2021-09-06 09:56:16 +01:00
Germain Souquet
997f43cb82
Implement new narrow mode UI
2021-09-03 12:03:19 +01:00
Germain Souquet
e416952c90
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-09-02 08:31:29 +01:00
Michael Telatynski
34e9443abc
Merge pull request #6722 from SimonBrandner/fix/autocomplete-dir
2021-09-01 14:45:30 +01:00
Šimon Brandner
4328ee18f5
Show autocomplete sections vertically
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-01 15:37:59 +02:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349
2021-09-01 08:47:10 +01:00
Šimon Brandner
2d47f453cd
Update styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 16:19:46 +02:00
Šimon Brandner
e8bf7ac227
Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295
2021-08-26 15:40:40 +02:00
Šimon Brandner
6003e12e48
Fix color name
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 15:12:26 +02:00
Šimon Brandner
408c327943
Merge remote-tracking branch 'upstream/develop' into fix/codeblock-border/18367
2021-08-26 15:11:46 +02:00
Germain Souquet
bd1aa01b67
Update copyright and method accessors
2021-08-26 08:19:44 +01:00
Travis Ralston
aa0a753105
Merge pull request #6681 from SimonBrandner/fix/codeblock-formatting
...
Fix codeblock formatting with syntax highlighting on
2021-08-25 13:36:47 -06:00
Germain Souquet
2d14be9cef
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-08-25 18:07:36 +01:00
Šimon Brandner
9f791031a8
Fix codeblock formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:54:52 +02:00
Šimon Brandner
ecd45f7a81
Use min-height instead of height
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:38:36 +02:00
Germain Souquet
31b3b2e2ed
Fix Sticker and Emoji picker opening on narrow mode
2021-08-25 15:39:50 +01:00
Germain Souquet
77a463e679
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-25 08:53:16 +01:00
Germain Souquet
54a0a869bf
PR feedback
2021-08-24 09:09:28 +01:00
Šimon Brandner
3d9a0286dc
Revert "$avatar-bg-color -> $background"
...
This reverts commit a3a6f73049
.
2021-08-24 09:04:17 +02:00
Šimon Brandner
bf87413442
Revert "$roomlist-header-color -> $tertiary-content"
...
This reverts commit 25a3a8ddfd
.
2021-08-24 09:02:17 +02:00
Šimon Brandner
b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
Germain Souquet
edd4d42e7f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 17:31:37 +01:00
Germain Souquet
9facb0d963
Polish UI
2021-08-23 14:44:44 +01:00
David Baker
b391ee0bbf
Merge pull request #6451 from SimonBrandner/fix/replies-bubble/18184
...
Fix replies on the bubble layout
2021-08-23 11:29:28 +01:00
Germain Souquet
393bd4871f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 10:15:35 +01:00
Šimon Brandner
b58184d61e
Make autocomplete smaller
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-21 19:04:26 +02:00
Šimon Brandner
81d64bec58
Fix autocomplete scrollbar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-21 18:18:53 +02:00
Travis Ralston
3e19fc1984
Merge pull request #6620 from SimonBrandner/feature/vertical-autocomplete/18558
...
Format autocomplete suggestions vertically
2021-08-20 09:10:36 -06:00
Germain Souquet
30a762944a
Implement a very low fidelity UI for threads
2021-08-20 12:11:04 +01:00
Šimon Brandner
952fdd04c1
Fix call tiles on the bubble layout
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-20 10:04:40 +02:00
Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Germain Souquet
d1dbfbd014
hide thread events from the timeline
2021-08-17 11:10:02 +01:00
Šimon Brandner
2ca616c239
Format autocomplete suggestions vertically
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:15:54 +02:00
Šimon Brandner
25a3a8ddfd
$roomlist-header-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:31 +02:00
Šimon Brandner
0faedebb92
$roomheader-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:30 +02:00
Šimon Brandner
a3a6f73049
$avatar-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:30 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:34 +02:00
Travis Ralston
2e6da2dc6e
Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474
...
Remove tiny scrollbar dot from code blocks
2021-08-11 13:54:47 -06:00
Travis Ralston
a149108a7d
Merge pull request #6353 from SimonBrandner/feature/improved-composer
...
Improve handling of pills in the composer
2021-08-11 10:55:13 -06:00
Šimon Brandner
5bc165f2ac
Make scrollbar dot transparent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:33:16 +02:00
Šimon Brandner
d43eac7722
Add bubble highlight styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 15:00:25 +02:00
Travis Ralston
fbe8f04942
Fix height jump of recording states
...
Fixes https://github.com/vector-im/element-web/issues/18431
2021-08-06 09:04:36 -06:00
Travis Ralston
cab4f2e402
Move stop button to the left of the waveform
...
Fixes https://github.com/vector-im/element-web/issues/18416
2021-08-06 09:00:18 -06:00
Šimon Brandner
3c0ac487da
Remove comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:06:24 +02:00
Šimon Brandner
f57bffad3c
Soften border color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:05:33 +02:00
Šimon Brandner
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
2021-08-06 08:02:28 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:45:17 +02:00
Travis Ralston
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start
...
Use `flex-start` instead of `start`
2021-08-05 15:46:12 -06:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
...
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
...
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
Šimon Brandner
443db125a9
Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 14:36:55 +02:00
Šimon Brandner
fe643b2401
Use flex-start as it has more universal support
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:09:48 +02:00
Germain Souquet
b4b788e8d5
Fix right margin for events on IRC layout
...
Fixes vector-im/element-web#18354
2021-08-04 11:21:52 +02:00
Travis Ralston
24da0291a0
Re-center recording LED
...
Fixes https://github.com/vector-im/element-web/issues/18375
2021-08-03 13:34:04 -06:00
Travis Ralston
7b565db02d
Update uploading state designs
2021-08-03 12:52:21 -06:00
Travis Ralston
c5d11a9f17
Improve voice messages uploading state
...
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
Jano Garcia
27e432df4b
Merge pull request #6513 from matrix-org/jano/fix-link-decoration
...
Fix inconsistent styling for links on hover
2021-07-30 14:08:15 +02:00
janogarcia
adfbcdce40
Fix the inconsistent styling between non-markdown and markdown parsed links on hover.
...
It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).
https://webaim.org/techniques/hypertext/link_text#underlining
2021-07-30 09:54:28 +02:00
Germain Souquet
11322b8999
Appease linter
2021-07-30 09:19:34 +02:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-30 08:10:15 +01:00
Germain
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195
...
Prevent timeline flickering on hover
2021-07-29 14:33:34 +01:00
Germain
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249
...
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 12:20:56 +01:00
Germain Souquet
6c68f779ec
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 11:58:32 +02:00
Germain Souquet
9c4101fa89
Align event list summary read receipts when using message bubbles
2021-07-29 11:48:22 +02:00
Germain Souquet
78a9117598
Prevent timeline flickering on hover
2021-07-29 11:12:07 +02:00
Germain Souquet
e140dd6ba1
Merge branch 'develop' into gsouquet/fix-18132
2021-07-29 10:27:00 +02:00
Germain Souquet
ee7f3c000d
Merge branch 'develop' into gsouquet/fix-18144
2021-07-29 10:04:47 +02:00
Germain Souquet
a4cf147d72
Merge branch 'develop' into gsouquet/fix-18264
2021-07-28 10:30:29 +02:00
Robin Townsend
3694006d05
Realign reactions row with messages in modern layout
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 23:48:51 -04:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
...
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
Germain Souquet
3037be11c4
Restore padding for single person state events
2021-07-27 16:24:05 +02:00
David Baker
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017
...
Make new reply UI clickable
2021-07-27 13:57:41 +01:00
David Baker
72becb73e1
Merge pull request #6473 from matrix-org/gsouquet/fix-18208
...
Fix deleted message left offset in the timeline
2021-07-27 13:40:20 +01:00
Germain
50aee28bf0
Merge pull request #6480 from matrix-org/gsouquet/fix-18137
...
Add data-layout to MELS for better CSS structure
2021-07-27 13:15:02 +01:00
Germain Souquet
8104ba936c
Add data-layout to MELS for better CSS structure
2021-07-27 11:30:25 +02:00
Germain
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199
2021-07-27 09:48:19 +01:00
Germain Souquet
e2688cd5e0
Left align unbubbled events
2021-07-26 16:53:37 +02:00
Germain Souquet
486d576b23
Merge branch 'develop' into gsouquet/fix-18132
2021-07-26 15:49:55 +02:00
Germain Souquet
88bd22ded3
Make new reply UI clickable
2021-07-26 13:50:04 +02:00
Germain Souquet
46a370a818
Fix deleted message left offset in the timeline
2021-07-26 11:01:37 +02:00
Germain Souquet
468887415a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-26 09:25:31 +02:00
Germain
774e743741
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-26 08:16:13 +01:00
Germain
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128
2021-07-26 07:41:42 +01:00
Šimon Brandner
d206a0b8d3
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199
2021-07-23 18:39:42 +02:00
Šimon Brandner
c6df7e4e41
Style markdown quotes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-23 17:46:49 +02:00
Germain Souquet
43f809ccc8
Fix call events layout for message bubble
2021-07-23 15:15:44 +02:00
Germain Souquet
3ce6fcc64b
Fix reactions row pushing content on IRC layout
2021-07-23 14:58:27 +02:00
Germain Souquet
42b213ba8c
Fix clipped avatar in room list
2021-07-23 14:17:26 +02:00
Germain Souquet
dcfd5d4793
Overlay avatar on top of bubbles
2021-07-23 12:12:52 +02:00
Germain Souquet
1ba5f19f2e
Put avatar is right place when sender isnt displayed in message bubbles
2021-07-23 12:10:34 +02:00
Germain Souquet
f99c0fad3e
Make inline events feel less claustrophobic in bubble layout
2021-07-23 11:40:34 +02:00
Germain
ffcc9631df
Merge pull request #6449 from matrix-org/gsouquet/fix-18153
...
Add event selected state for message bubbles
2021-07-23 08:10:50 +01:00
Michael Telatynski
d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028
2021-07-23 06:12:02 +01:00
Šimon Brandner
4d5565b9e8
Fix sender profile alignment in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 18:18:37 +02:00
Šimon Brandner
8e7a60a612
Fix replies on the bubble layout
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:58:18 +02:00
Šimon Brandner
bd46275ec6
Don't show scrollbar for url previews
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:48:17 +02:00
Germain
248a758ad6
Merge pull request #6439 from matrix-org/gsouquet/fix-18142
...
Fix avatar obstructing membership and state changes
2021-07-22 16:16:33 +01:00
Germain Souquet
0768f03097
Migrate ViewSourceEvent to TypeScript
2021-07-22 17:11:23 +02:00
Germain Souquet
224a9db3ec
Add event selected state for message bubbles
2021-07-22 16:48:55 +02:00
Germain Souquet
229d139568
Always display the Sender in the reply tile
2021-07-22 15:23:08 +02:00
Michael Telatynski
88884bbaad
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes
2021-07-22 12:20:27 +01:00
Germain
951ceb194c
Merge pull request #6438 from matrix-org/gsouquet/fix-18074
...
Prevent action bar to overlap the event content
2021-07-22 12:14:29 +01:00
Šimon Brandner
6ae320831a
Make quotes thinner
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 13:10:25 +02:00
Travis Ralston
c4b08d7eca
Merge pull request #6440 from SimonBrandner/fix/codeblocks
...
Revert 100% on codeblocks
2021-07-22 03:49:11 -06:00
Šimon Brandner
85e08d5074
Revert 100%
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 11:43:29 +02:00
Travis Ralston
b9b37f59f1
Merge pull request #6432 from matrix-org/travis/voice-messages/colours
...
Clean up visual style of files and voice messages
2021-07-22 03:39:29 -06:00
Germain Souquet
8da2d0fe72
Fix avatar obstructing membership and state changes
2021-07-22 11:31:46 +02:00
Germain Souquet
9180d478eb
Prevent action bar to overlap the event content
2021-07-22 11:00:34 +02:00
Germain
51178735c9
Merge pull request #6428 from matrix-org/gsouquet/fix-18129
2021-07-22 08:44:40 +01:00
Travis Ralston
fd9241a854
Merge pull request #6355 from SimonBrandner/fix/diff-colors
...
Make diff colors in codeblocks more pleasant
2021-07-21 20:02:03 -06:00
Travis Ralston
ca1a1e488a
Take out the jump when recording a voice message
2021-07-21 14:47:42 -06:00
Germain
22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-21 15:11:49 +01:00
Germain Souquet
0fb210cadb
Increase hit area for timestamp in message bubbles
2021-07-21 15:31:10 +02:00
Germain
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099
2021-07-21 11:57:29 +01:00