mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 02:11:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
33098 commits 219 branches 562 tags 474 MiB
Commit graph

2486 commits

Author SHA1 Message Date
Jason Robinson
8c108e1ee8 Sync en_EN.json file 2021-01-05 14:54:50 +02:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-04 19:17:17 -06:00
Jason Robinson
6286c23aa5 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-04 15:46:28 +02:00
Aaron Raimist
b8334bfd4a
Add option to hide the stickers button in the composer 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-02 15:31:54 -06:00
Travis Ralston
254e0b9a94 Add a basic widget explorer to devtools (per-room) 2020-12-29 15:30:22 -07:00
Travis Ralston
7e0cf5c783 Wire up MSC2931 widget navigation 
Fixes https://github.com/vector-im/element-web/issues/16006
**Requires https://github.com/matrix-org/matrix-widget-api/pull/27**
 2020-12-29 12:35:48 -07:00
Jason Robinson
6843737a33 Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-12-28 11:22:05 +02:00
Šimon Brandner
b24464269f
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 18:28:53 +01:00
Šimon Brandner
65af77e546 i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-24 08:01:35 +01:00
David Baker
452fbb076b Add a dialpad UI for PSTN lookup 
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
 2020-12-23 19:02:01 +00:00
Šimon Brandner
ad5844fcc0 Fix i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-21 20:33:03 +01:00
Šimon Brandner
743b91d7a1 Merge branch 'develop' into improve-image-view 2020-12-21 20:32:28 +01:00
David Baker
12474bb434 Merge remote-tracking branch 'origin/develop' into dbkr/call_ui_fixups 2020-12-21 11:10:31 +00:00
Travis Ralston
9263bf7cda Add a snowfall chat effect (with /snowfall command) 2020-12-21 00:13:55 -07:00
Šimon Brandner
00bc97b63f i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:45:47 +01:00
Travis Ralston
82b782cdb9 Merge branch 'develop' into travis/upstream/fireworks 2020-12-18 18:30:54 -07:00
David Baker
aee861956c Remove secondary call avatar 
and change 'paused' to 'on hold'
 2020-12-18 19:40:57 +00:00
David Baker
eab764a3c8 Vary resume link text 
Use 'Switch' if unholding that call would hold another
 2020-12-18 19:35:41 +00:00
nurjin jafar
ebe02ecf04
Merge branch 'develop' into nic/feat/PB-404-fireworks-effect 2020-12-18 16:15:14 +01:00
Emmanouil Kampitakis
2488a8f1ee Add string-translation for english 
Signed-off-by: Emmanouil Kampitakis <info+github@kampitakis.de>
 2020-12-18 12:19:37 +01:00
nurjinn jafar
380b729692 fireworks effect added 2020-12-17 16:57:59 +01:00
Jason Robinson
f0e93c6929 Mark remaining strings to be translated 2020-12-17 12:06:42 +02:00
Jason Robinson
5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
David Baker
5aa8650fac i18n 2020-12-15 16:27:04 +00:00
David Baker
a33be00c08 Basic call transfer initiation support 
Adapt the InviteDialog to select a transfer target

Doesn't support supplying a roo mID fr the transfer: just leaves
the transferee to work out how to contact the target themselves.

MSC2747 (matrix-org/matrix-doc#2747)
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1558
 2020-12-15 14:59:06 +00:00
Will Hunt
3466813c23 Remove showmore show less 2020-12-14 12:59:59 +00:00
Will Hunt
e7693dc95d Update variable in translation files 2020-12-14 12:59:59 +00:00
David Baker
07fa535513 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 16:11:29 +00:00
Travis Ralston
18a60ae2ea
Merge pull request #5484 from matrix-org/travis/remove-dead-feature 
Remove impossible labs feature: sending hidden read receipts
 2020-12-10 08:24:05 -07:00
David Baker
5282c6bbe8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 12:36:11 +00:00
Travis Ralston
27df6ae6e1 Remove impossible labs feature: sending hidden read receipts 
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
 2020-12-09 18:36:48 -07:00
David Baker
4a009d480d Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-08 11:48:14 +00:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
David Baker
8a58c9dea0 Update UI for two calls in the PiP view 
and also merge hold_ui changes
 2020-12-07 17:56:36 +00:00
Michael Telatynski
499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
Lukas
9bb04a857b Add generated i18n json 2020-12-07 15:21:31 +01:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker
0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker
482c0a2f6a i18n 2020-12-03 17:49:22 +00:00
David Baker
1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
Šimon Brandner
19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:06:43 +01:00
Michael Telatynski
8593845e3d i18n 2020-12-02 15:12:16 +00:00
Šimon Brandner
8287f197f4 Fix i18n 2020-12-01 19:49:31 +01:00
Michael Telatynski
ba542f291b
Merge branch 'develop' into t3chguy/socials 2020-12-01 15:50:07 +00:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
Michael Telatynski
26e1cdb82c Update i18n 2020-12-01 12:04:41 +00:00
Travis Ralston
9b6f93da5f Update i18n 2020-11-30 13:42:29 -07:00
Šimon Brandner
aba5ef100f Merge branch 'develop' into feature-multi-language-spell-check 2020-11-28 19:18:17 +01:00
nurjinn jafar
2f72c9ee55 update translation file 2020-11-27 16:47:07 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
David Baker
4f35bc0865 Merge remote-tracking branch 'origin/develop' into dbkr/user_media_error 2020-11-27 14:29:22 +00:00
David Baker
9a5f2c85cd i18n 2020-11-27 14:04:27 +00:00
Jason Robinson
cdf8aa13cc Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-11-27 16:01:29 +02:00
Šimon Brandner
eb64e5b2af Merge branch 'develop' into feature-change-password-validation 2020-11-27 14:46:08 +01:00
Jason Robinson
835e417333 Translate all the strings 2020-11-27 15:10:35 +02:00
Richard Lewis
116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
David Baker
65ab0ee665 Slightly better error if we can't capture user media 
Fixes https://github.com/vector-im/element-web/issues/15837
 2020-11-27 12:53:09 +00:00
J. Ryan Stinnett
826466179a
Merge pull request #5244 from akissinger/katex 
LaTeX rendering in element-web using KaTeX
 2020-11-27 11:55:26 +00:00
Michael Telatynski
edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700 
Simplify UserMenu for Guests as they can't use most of the options
 2020-11-27 10:57:54 +00:00
Michael Telatynski
00b1cd01eb Update copy 2020-11-27 09:44:04 +00:00
Aleks Kissinger
7013483dad UK spelling maths 2020-11-26 17:26:42 +00:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Michael Telatynski
5f03cbd88f Iterate PR some more 2020-11-26 15:45:15 +00:00
David Baker
2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00
Šimon Brandner
051368eaab Fix i18n 2020-11-26 13:53:22 +01:00
Michael Telatynski
c4084196d1 delint 2020-11-25 10:39:44 +00:00
Michael Telatynski
758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski
f7d7182dc9 Iterate Multi-SSO support 2020-11-24 12:09:11 +00:00
Michael Telatynski
b1ca1eb3f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Michael Telatynski
613710b75c Iterate Auth copy 2020-11-23 17:01:35 +00:00
David Baker
f0fdfd53d2
Merge pull request #5432 from matrix-org/dbkr/new_look_callview 
New Look in-Call View
 2020-11-23 15:51:09 +00:00
David Baker
2e3d889bbf consistent capitalisation 2020-11-23 15:28:54 +00:00
Michael Telatynski
56ffa17b89
Merge pull request #5433 from matrix-org/t3chguy/socials_preamble 
Auth typescripting and validation tweaks
 2020-11-23 14:14:25 +00:00
Michael Telatynski
2263280035 Improve no email warning during registration 2020-11-23 10:25:46 +00:00
Šimon Brandner
4d7886d177 Fix i18n 2020-11-21 21:18:26 +01:00
Resynth
1b48b08525
Update src/i18n/strings/en_EN.json 2020-11-20 18:23:18 +00:00
Resynth
0e4d656e4b
Update src/i18n/strings/en_EN.json 2020-11-20 18:21:39 +00:00
Travis Ralston
5f47077a30
Merge pull request #5385 from matrix-org/travis/msc-send-widget-events 
Add new widget API actions for changing rooms and sending/receiving events
 2020-11-20 09:17:18 -07:00
Michael Telatynski
0b74d3a0ef Use field validation for PasswordLogin instead of global errors 2020-11-20 13:23:10 +00:00
Travis Ralston
ff9d696881 Update i18n 2020-11-19 12:10:28 -07:00
Travis Ralston
21663314ee Minor touchups to the dialog 2020-11-19 11:24:17 -07:00
Travis Ralston
ddd8bdc00e Move all the capability copy to its own class 2020-11-19 11:15:42 -07:00
David Baker
c411213db1 i18n 2020-11-19 16:40:45 +00:00
David Baker
84f1ebf63a i18n 2020-11-19 15:33:08 +00:00
Clemens Zeidler
1346416d20 Merge branch 'develop' into ctrl-enter-send 2020-11-19 19:40:38 +13:00
Travis Ralston
55592d365c Merge branch 'develop' into travis/msc-send-widget-events 2020-11-18 15:57:53 -07:00
Travis Ralston
df6218ef4a
Merge pull request #5364 from mkenigs/mxc-imgs 
Specify community description img must be mxc urls
 2020-11-18 15:21:09 -07:00
Heiko Carrasco
3fd13b89b8
Merge branch 'develop' into develop 2020-11-18 20:14:25 +01:00
Michael Telatynski
11fb081f7a
Merge pull request #5423 from matrix-org/t3chguy/sso 
Redirect user home from auth screens if they are already logged in
 2020-11-18 15:49:47 +00:00
J. Ryan Stinnett
23d039b961
Merge pull request #5428 from matrix-org/jryans/fix-message-search-summary 
Fix message search summary text
 2020-11-18 15:21:04 +00:00
J. Ryan Stinnett
14e64c10a3 Restore numeric count as well for better pluralisation 2020-11-18 15:16:35 +00:00
J. Ryan Stinnett
95a436cdaf Use room(s) style in message 2020-11-18 14:57:31 +00:00
J. Ryan Stinnett
a2a07b528a Fix message search summary text 
This repairs the message search summary text, which regressed in
https://github.com/matrix-org/matrix-react-sdk/pull/5416. We can't use the `one`
/ `other` syntax here since there are two numbers and they are both strings.

Fixes https://github.com/vector-im/element-web/issues/15766
 2020-11-18 14:46:46 +00:00
David Baker
41e885dd67 Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview 2020-11-18 14:28:03 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle 
Small delight tweaks to improve rough corners in the app
 2020-11-18 10:07:31 +00:00
Travis Ralston
a212dab84c Developer design a permissions dialog 2020-11-17 20:38:59 -07:00
Michael Telatynski
e05fcc8d34
Merge pull request #5408 from matrix-org/t3chguy/fix/15400 
Update styling of the Analytics toast
 2020-11-17 15:35:20 +00:00
Michael Telatynski
c6ecd59114 i18n 2020-11-16 16:30:23 +00:00
David Baker
c921567831 WIP: the new call views work now 
just need to add the buttons and then get rid of the status bar
 2020-11-12 18:09:56 +00:00
Michael Telatynski
5f23c9499c Simplify UserMenu for Guests as they can't use most of the options 2020-11-12 12:46:55 +00:00
Michael Telatynski
24a393342d
Merge pull request #5416 from matrix-org/t3chguy/fix/14852 
Fix poorly i18n'd string
 2020-11-12 10:43:22 +00:00
Michael Telatynski
bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415 
Change how we expose Role in User Info and hide in DMs
 2020-11-11 18:15:46 +00:00
Michael Telatynski
a2958f8f99 i18n 2020-11-11 17:04:10 +00:00
Michael Telatynski
a481f3bdf1 Iterate the filtering prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
d3fee540c5 Update Room List filter copy 2020-11-11 17:04:09 +00:00
Michael Telatynski
71e2536d02 sort file i18n 2020-11-11 16:51:56 +00:00
Michael Telatynski
979faf23e8 Fix poorly i18n'd string 2020-11-11 16:49:51 +00:00
Aaron Raimist
29a81bbe85
Warn when you attempt to leave room that you are the only member of 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-10 15:05:25 -06:00
Aleks Kissinger
5f3af7863a Merge branch 'develop' into katex 2020-11-10 18:19:20 +00:00
Michael Telatynski
0766519467
Merge pull request #5398 from matrix-org/t3chguy/fix/8141 
Improvements around new room empty space interactions
 2020-11-10 13:09:59 +00:00
Michael Telatynski
db3f125e26 Change how we expose Role in User Info and hide in DMs 2020-11-10 12:03:50 +00:00
David Baker
50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold 
Implement call hold
 2020-11-10 08:41:34 +00:00
Michael Telatynski
36ef9ec341 Update styling of the Analytics toast to try and decrease number of users blindly pressing No 2020-11-09 14:21:45 +00:00
Aaron Raimist
d121f8a357
Allow country names to be translated 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-08 22:33:15 -06:00
Michael Telatynski
c269577037 i18n 2020-11-05 15:51:36 +00:00
David Baker
d145b1081c Merge branch 'dbkr/call_hold' into dbkr/new_look_callview 2020-11-05 14:25:35 +00:00
Michael Telatynski
2fdfe9346f Update copy on the Encryption Enabled bubble tile and room creation ELS to cater better in general but specifically for DMs 2020-11-04 17:50:59 +00:00
Matthew Hodgson
ced58b9ecf apostrophe!! 2020-11-04 14:54:53 +00:00
Michael Telatynski
5a8525dd93
Merge pull request #5387 from matrix-org/t3chguy/fix/13066 
Invite / Create DM UX tweaks
 2020-11-04 14:01:21 +00:00
Michael Telatynski
5c9acc364f
Merge pull request #5383 from matrix-org/t3chguy/fix/15604 
Tweaks to toasts and post-registration landing
 2020-11-04 13:59:51 +00:00
Michael Telatynski
f583978c42
Merge pull request #5392 from matrix-org/t3chguy/fix/15543 
Hide prompt to add email for notifications if 3pid ui feature is off
 2020-11-04 09:19:29 +00:00
Michael Telatynski
a51307af25 i18n 2020-11-03 23:25:06 +00:00
Michael Telatynski
0da23e2cbd Fix copy for call hangup previews 2020-11-03 15:22:23 +00:00
Michael Telatynski
0221c4aebf i18n 2020-11-03 14:56:16 +00:00
Michael Telatynski
3a6420b40d i18n 2020-11-02 17:26:00 +00:00
David Baker
7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
Michael Telatynski
b01055f962 Tidy up and fix some edge cases 2020-10-30 10:26:15 +00:00
David Baker
f828c6d494 Implement call hold 
Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
 2020-10-29 17:56:24 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Matthew Kenigsberg
24ba566877 Specify community description img must be mxc urls 
Closes vector-im/element-web#7100

Signed-off-by: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
 2020-10-28 18:34:54 -05:00
Travis Ralston
09b02d0120 Fix i18n 2020-10-28 10:50:38 -06:00
Resynth
76edd551e5 Fix i18n 
Signed-off-by: Resynth <resynth1943@tutanota.com>
 2020-10-26 00:34:14 +00:00
Aleks Kissinger
4536f51ec0 Merge branch 'develop' into katex 2020-10-25 12:28:17 +00:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
David Baker
fa1a956733
Merge pull request #5345 from matrix-org/dbkr/select_answer 
Support 'answered elsewhere'
 2020-10-21 13:42:23 +01:00
Steffen Kolmer
daa03098f3 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-21 14:21:25 +02:00
Steffen Kolmer
047c29731b Added missing translation 2020-10-21 14:15:27 +02:00
David Baker
765fdf93e6 Support 'answered elsewhere' 
Show a dialog for now, telling the user someone beat them to it.

Only useful with https://github.com/matrix-org/matrix-js-sdk/pull/1522
(but can be merged safely without).
 2020-10-21 11:54:48 +01:00
Michael Telatynski
b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
Steffen Kolmer
607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
 2020-10-19 19:46:07 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
David Baker
b10f7a47fd
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups 
Support rejecting calls
 2020-10-19 09:57:13 +01:00
Michael Telatynski
da7a02b545 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 12:23:10 +01:00
Travis Ralston
5c79f35cc5
Merge pull request #5316 from matrix-org/travis/less-acl-noise 
Make the ACL update message less noisy
 2020-10-15 09:49:03 -06:00
Michael Telatynski
efbce309d0 improve paddings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:42:08 +01:00
David Baker
7ad366603a Support rejecting calls 
Use the 'reject' method when we want to reject an incoming call
rather than end one that's in progress. Also get our error messages
right for the other side rejecting the call (albeit still with
placeholder dialog-box UX).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1510
 2020-10-15 14:54:03 +01:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Arsh Sharma
7e4b32c0d2 fixing i18 error 2020-10-14 16:44:58 +05:30
Travis Ralston
161dc0b6c6 Add i18n 2020-10-13 15:11:48 -06:00
Heiko Carrasco
f36651f538
Add keyboard shortcut to close current conversations 
Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
 2020-10-13 17:26:14 +02:00
Michael Telatynski
a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-10-13 13:45:22 +01:00
Michael Telatynski
37558f1f0d Improve the context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 09:51:49 +01:00
Aleks Kissinger
bdd332c8b5 ran yarn i18n 2020-10-10 20:05:35 +01:00
Aleks Kissinger
aafaf34233 Merge branch 'develop' into katex 2020-10-10 19:31:46 +01:00
Aleks Kissinger
a89adb86a5 i18n en+nl for latex math labs setting 2020-10-10 16:33:25 +01:00
David Baker
55f77b04ae Rewrite call state machine 
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
 2020-10-09 18:56:07 +01:00
Michael Telatynski
b2dc5542b3 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 09:00:38 +01:00
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
4dd6e96bfd Regenerate strings 2020-10-07 13:00:27 +01:00
Michael Telatynski
29e3881fb3 Iterate design and fix post-merge conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:36:45 +01:00
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
Michael Telatynski
55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 
 Conflicts:
	src/components/views/settings/ProfileSettings.js
 2020-10-06 10:51:30 +01:00
Michael Telatynski
39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323 
Update copy for `redact` permission
 2020-10-06 10:24:26 +01:00
Hubert Chathi
f5f0686586
Merge pull request #5239 from uhoreg/dehydration 
Add support for dehydrated devices
 2020-10-05 17:40:49 -04:00
Hubert Chathi
49cc62ca43 Oh right. Run i18n again. 2020-10-02 17:48:13 -04:00
Michael Telatynski
7d11c3092d Decorate failed e2ee downgrade attempts better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:38:02 +01:00
Hubert Chathi
bd9cebe35d oh right, I need to run the i18n script too 2020-10-01 21:52:28 -04:00
Michael Telatynski
c73ef57887 Update copy for redact permission 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:51:35 +01:00
Michael Telatynski
4bd7ae5131 Show server errors from saving profile settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:49:22 +01:00
Michael Telatynski
23d95df30b Rebuild the room summary card's widgets section 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:08:41 +01:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup 
Make the hangup button do things for conference calls
 2020-09-29 11:06:21 -06:00
Travis Ralston
bfa269a848 Update copy 2020-09-29 10:20:54 -06:00
Daniel Maslowski
43ff97c178 Add support for giving reason when redacting 
Signed-off-by: Daniel Maslowski <info@orangecms.org>
 2020-09-28 23:29:33 +02:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5 Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious 2020-09-28 13:41:48 -06:00
Michael Telatynski
290ef5e652 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
 2020-09-28 12:47:47 +01:00
David Baker
585c7637d6
Merge pull request #5248 from matrix-org/dbkr/callhandler_to_ts 
Convert CallHandler to typescript
 2020-09-25 15:52:21 +01:00
Michael Telatynski
fbbba75f81 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-09-25 14:31:44 +01:00
Michael Telatynski
6919a8239f i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-25 14:17:22 +01:00
David Baker
80f47f0378 i18n 2020-09-24 16:20:32 +01:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120 
Rework profile area for user and room settings to be more clear
 2020-09-24 08:39:01 -06:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files 
Add a note to use the desktop builds when seshat isn't available
 2020-09-22 10:25:34 -06:00
Travis Ralston
be6c242206
Merge pull request #5240 from matrix-org/travis/communities/v2-proto/permissions 
Add some permission checks to the communities v2 prototype
 2020-09-22 10:21:39 -06:00
Travis Ralston
4f983ad9a1 Rework profile sections of user and room settings 
Mostly by design request. Some is freehand, to be reviewed.
 2020-09-21 21:00:51 -06:00
Travis Ralston
342f1d5b43 Extremely bad support for "temporary widgets" 2020-09-21 14:36:24 -06:00
J. Ryan Stinnett
115c7ccd4e Support HS-preferred Secure Backup setup methods 
This adds support for the `secure_backup_setup_methods` key, which allows HS
admins to state that Element should simplify down to only one setup method,
rather than offering both.

Fixes https://github.com/vector-im/element-web/issues/15238
 2020-09-21 16:10:42 +01:00
Travis Ralston
26b18811ce Add some permission checks to the communities v2 prototype 
Prototype behaviour:
* If you can't create a room in the community, say so.
  * The UX for this could probably be improved, but for now the intention is to not break muscle memory by hiding the create room option.
* If you can't change settings in the community, or can't invite people, don't show those respective options.
  * Breaking muscle memory here is moderately okay.
 2020-09-18 16:04:19 -06:00
Michael Telatynski
2492041ee4
Merge pull request #5236 from matrix-org/t3chguy/fix/15237 
Rename apps back to widgets
 2020-09-18 19:04:34 +01:00
Travis Ralston
8838bd724b Update copy for files 2020-09-18 10:58:17 -06:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Michael Telatynski
949b8d9afe Rename apps back to widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 16:35:42 +01:00
Travis Ralston
46f6c140e6
Merge pull request #5231 from matrix-org/travis/e2e-default-serverside 
Disable the e2ee toggle when creating a room on a server with forced e2e
 2020-09-18 07:50:45 -06:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup 
Defer encryption setup until first E2EE room
 2020-09-18 10:28:33 +01:00
Travis Ralston
38f8c0a835 Disable the e2ee toggle when creating a room on a server with forced e2e 
Fixes https://github.com/vector-im/element-web/issues/15186
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1470
 2020-09-17 22:46:01 -06:00
Michael Telatynski
25171347a0 i18n 2020-09-17 13:57:47 +01:00
Michael Telatynski
f52b267bd3 i18n 2020-09-17 12:07:17 +01:00
Travis Ralston
bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00
Travis Ralston
f412f8defe Change copy if the widget is unpinned 2020-09-16 14:59:15 -06:00
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls 
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
 2020-09-16 14:35:55 -06:00
Travis Ralston
12fb1ee1cf Clean up now-unused code 2020-09-16 12:43:28 -06:00
Travis Ralston
b4af0140d4 Render Jitsi widget state events in a more obvious way 
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
 2020-09-16 12:38:47 -06:00
Michael Telatynski
4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173 
Hide Analytics sections if piwik config is not provided
 2020-09-16 16:34:55 +01:00
Michael Telatynski
9be04f8a67 i18n 2020-09-16 16:10:43 +01:00
Michael Telatynski
a784e29622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-16 16:09:08 +01:00
Michael Telatynski
4e2b6c2a30
Merge pull request #5212 from matrix-org/t3chguy/fix/15172 
Also hide bug reporting prompts from the Error Boundaries
 2020-09-16 15:59:07 +01:00
J. Ryan Stinnett
7a5b0a964f Adjust main encryption toast to reference Secure Backup 
This adjusts the main toast to focus on Secure Backup as suggested in designs.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
26b465f1fd Remove room recovery reminder 
The Secure Backup toast replaces this with better UX.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
46f37fb969 Create cross-signing keys during authentication 
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
685878a101 Clarify diagnostic about keys in storage 
Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
Michael Telatynski
45420ff13b i18n 2020-09-16 11:27:39 +01:00
Michael Telatynski
dbd3245e02 i18n 2020-09-16 10:53:30 +01:00
Michael Telatynski
771ab82598 Hide Analytics sections if piwik config is not provided 2020-09-16 10:29:21 +01:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172 
If no bug_report_endpoint_url, hide rageshaking from the App
 2020-09-15 16:23:48 +01:00
Michael Telatynski
16d8ea184d i18n 2020-09-15 15:58:23 +01:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Travis Ralston
0cac6874d4 Update i18n 2020-09-14 22:31:45 -06:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first 
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
 2020-09-14 22:28:02 -06:00
David Baker
c68a980c59
Merge pull request #5193 from matrix-org/dbkr/remove_jitsi_widget_on_call_button 
Prompt to remove the jitsi widget when pressing the call button
 2020-09-14 09:44:45 +01:00
David Baker
e54d4e665f Don't prompt to remove jitsi widget if the user don't have permission 2020-09-11 12:20:32 +01:00
David Baker
de8865d844
Merge pull request #5191 from matrix-org/dbkr/jitsi_call_naming 
Call jitsi widgets 'group calls'
 2020-09-11 10:27:00 +01:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup 
Split up cross-signing and secure backup settings
 2020-09-11 09:41:40 +01:00
David Baker
96080f2ccc Prompt to remove the jitsi widget when pressing the call button 
If there's already one in the room.

We threw up an error message anyway telling you there was already
a jitsi widget, so just add a button to end the call.
 2020-09-10 14:06:13 +01:00
David Baker
2b965a2741 Call jitsi widgets 'group calls' 
So they feel a bit more like first class citizens
 2020-09-10 11:52:01 +01:00
Travis Ralston
77f715ba73 Fix i18n and analytics 2020-09-09 14:55:27 -06:00
J. Ryan Stinnett
0219824d6f Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup 2020-09-09 14:13:23 +01:00
Michael Telatynski
8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Clemens Zeidler
9031c58aeb Make settings label platform specific 2020-09-09 19:27:11 +12:00
Clemens Zeidler
db61d343f5 Add option to send/edit a message with Ctrl + Enter / Command + Enter 
When editing multi-line text this option helps to prevent accidentally
sending a message too early. With this option, Enter just inserts a new
line.

For example, composing programming code in a dev chat becomes much
easier when Enter just inserts a new line instead of sending the
message.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2020-09-09 19:27:11 +12:00
J. Ryan Stinnett
bbe2084f66 Add independent set up / reset actions in Settings 
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
 2020-09-08 18:01:56 +01:00
Michael Telatynski
12a6bc8231 update copy 2020-09-08 18:00:21 +01:00
Michael Telatynski
73dcba1425 i18n 2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217 Consolidate all the work thus far 2020-09-08 15:43:38 +01:00
Michael Telatynski
2527344294 Create name/title Widget utils 2020-09-08 15:42:31 +01:00
J. Ryan Stinnett
aae68f7d1a Move 4S status to backup panel 
This moves the various 4S status diagnostics to the backup panel and out of the
cross-signing panel. The available actions are unchanged as part of this commit,
but they will be updated next.
 2020-09-08 15:26:59 +01:00
J. Ryan Stinnett
2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +01:00
Michael Telatynski
80b22d1f82
Merge pull request #5158 from dkanada/patch-1 
add lenny face command
 2020-09-07 14:28:40 +01:00
J. Ryan Stinnett
b484bc5e09 Rearrange backup status to always have advanced 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
19e9e0137c Reorganise backup panel so feature description is always present 
This ensure the feature description is always shown at the top.
 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
da6cc5c2e9 Tweak Security settings section headers 
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
 2020-09-03 15:41:17 +01:00
Travis Ralston
92c184385c Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-01 10:51:42 -06:00
Travis Ralston
fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston
724e3f6905 Run all selected prototype community logic through one store 2020-08-31 10:19:05 -06:00
Travis Ralston
93d67a6689 Wire up members button to member view 
Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.
 2020-08-31 10:12:12 -06:00
dkanada
8cae2fa0aa
update translations with new command string 2020-08-30 15:17:21 +09:00
Michael Telatynski
ac9108a9a6 i18n 2020-08-29 12:16:14 +01:00
Travis Ralston
35e4d89545 Add aria labels to menu options 2020-08-28 20:04:19 -06:00
Travis Ralston
02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston
01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston
e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Travis Ralston
cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change 
Update create room dialog copy & community prototype home icon
 2020-08-28 09:47:53 -06:00
Travis Ralston
f038103f97 Fix copy 2020-08-28 09:47:36 -06:00
J. Ryan Stinnett
e2acec6059
Merge pull request #5149 from matrix-org/jryans/defer-cross-signing-setup 
Migrate to new, separate APIs for cross-signing and secret storage
 2020-08-28 12:40:35 +01:00
Travis Ralston
be1de1d295 Update create room dialog copy 2020-08-27 13:49:40 -06:00
Travis Ralston
c28134eb11 Associate created rooms with the selected community 2020-08-26 10:53:06 -06:00
Travis Ralston
fd71bca7c0 Change menu label if in a community 2020-08-26 10:33:05 -06:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher 
Communities v2 prototype: Tag panel selection changes
 2020-08-26 10:22:50 -06:00
Travis Ralston
82b015bd5f Rename components to match prior convention 2020-08-26 08:52:39 -06:00
Travis Ralston
3e7d82b421 Change tip copy 2020-08-26 08:48:01 -06:00
Travis Ralston
c68636bd32 i18n updates 2020-08-25 21:59:09 -06:00
Travis Ralston
56c7f86983 Add an invite users to community step to dialog flow 2020-08-25 21:08:31 -06:00
Travis Ralston
7c1a9993e3 Add new create group dialog 2020-08-25 21:08:24 -06:00
Travis Ralston
8feda74156 Wire up TagPanel's create button to the dialog 2020-08-25 21:08:19 -06:00
nurjinn jafar
4527755f7e updated translation 2020-08-25 16:18:01 +02:00
J. Ryan Stinnett
a732c55797 Add secret storage readiness checks 
This visits all places that were checking for cross-siging readiness and adapts
them to also check for secret storage readiness if needed.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-08-25 13:20:15 +01:00
nurjinn jafar
1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 
 Conflicts:
	src/SlashCommands.tsx
	src/i18n/strings/de_DE.json
 2020-08-25 11:52:48 +02:00
J. Ryan Stinnett
8e0742b9fe
Merge pull request #5130 from matrix-org/jryans/secure-backup-required 
Enforce Secure Backup completion when requested by HS
 2020-08-24 17:32:58 +01:00
Travis Ralston
84d782022f
Merge pull request #5139 from matrix-org/travis/communities/room-behaviour 
Communities v2 prototype: Explore rooms, global state, and default room
 2020-08-24 07:43:01 -06:00
Travis Ralston
56e08f440e
Merge pull request #5133 from matrix-org/travis/communities/tag-panel 
Add communities v2 prototyping feature flag + initial tag panel prototypes
 2020-08-24 07:41:44 -06:00
nurjinn jafar
b79cf1e7ad updated translated string 2020-08-24 13:59:11 +02:00
nurjinn jafar
69227dd456 translations added 2020-08-24 10:26:20 +02:00
Travis Ralston
8e23b1072f Add i18n 
it's probably important
 2020-08-21 18:27:49 -06:00
Travis Ralston
fd06272062 Update i18n 2020-08-20 20:50:28 -06:00
Travis Ralston
0c80db8820 Add feature flag for prototypes 2020-08-20 19:44:59 -06:00
Travis Ralston
e0b8343088 Run all room leaving behaviour through a single function 
Fixes https://github.com/vector-im/element-web/issues/14999
Fixes https://github.com/vector-im/element-web/issues/10380

We were failing to handle errors when `/part`ing a room, though the leave room button was fine. This runs both the button and command through the same function for handling, including the 'view next room' behaviour.
 2020-08-19 19:21:40 -06:00
J. Ryan Stinnett
941cbc47c8 Fix casing of Secure Backup to match designs 2020-08-19 16:23:27 +01:00
Travis Ralston
534f0cc89e Revert "Merge pull request #5125 from matrix-org/travis/spec-i18n" 
This reverts commit d3dba0ba3a.
 2020-08-18 13:09:33 -06:00
Travis Ralston
d3dba0ba3a
Merge pull request #5125 from matrix-org/travis/spec-i18n 
Use matrix-doc for SAS emoji translations
 2020-08-18 11:41:42 -06:00
Michael Telatynski
d55cb4266a Update copy 2020-08-18 17:38:10 +01:00
Michael Telatynski
8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
nurjinn jafar
ecd4d6e19e test commit for confetti changes 2020-08-18 17:57:51 +02:00
nurjinn jafar
4394a20f87 setting added to User Settings -> Preferences -> Timeline as an opt out for users with german translation 2020-08-18 09:56:38 +02:00
Travis Ralston
d9e7253561 Use matrix-doc for SAS emoji translations 
This is done through the js-sdk's new SASEmojiV1 class.
 2020-08-17 15:37:36 -06:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski
be1d390a93
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608 
Switch out the globe icon and colour it depending on theme
 2020-08-14 18:10:29 +01:00
Michael Telatynski
228d1af6dc i18n 2020-08-14 11:01:03 +01:00
Michael Telatynski
e7bd656a19 i18n 2020-08-13 16:41:25 +01:00
Michael Telatynski
b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski
df980dbf92 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-12 22:48:03 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00