PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
34498 commits 1 branch 0 tags 338 MiB
Commit graph

2595 commits

Author SHA1 Message Date
Matthew Hodgson
14b828ecc6 shorten verify button label 2021-03-08 17:58:30 +00:00
Matthew Hodgson
1629b7e62a s/IP/ip/; s/from/at/ 2021-03-08 16:44:14 +00:00
Travis Ralston
761ced13f2
Merge pull request #5719 from matrix-org/travis/file-representation 
UI refresh for uploaded files
 2021-03-08 08:52:43 -07:00
Michael Telatynski
6a5efad142 Show suggested rooms from the selected space 2021-03-08 15:52:21 +00:00
David Baker
d71999114b
Merge pull request #5707 from matrix-org/dbkr/audiostream 
Option for audio streaming
 2021-03-08 11:50:45 +00:00
Michael Telatynski
6106e01ab4 Collapse redactions into an event list summary 2021-03-08 09:39:07 +00:00
Matthew Hodgson
c02d03cc5b Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop 2021-03-08 04:57:10 +00:00
Matthew Hodgson
96ebbad959 switch UnverifiedSessionToast to route to check sessions rather than verify the new login 
given the chances are that the new login will be stuck doing initial sync, and won't be in position
to be verified until its finished.
 2021-03-08 04:54:44 +00:00
Will Hunt
d07069238f Merge remote-tracking branch 'origin/develop' into hs/blocked-err 2021-03-05 18:50:00 +00:00
Travis Ralston
676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui 
File drop UI fixes and improvements
 2021-03-04 20:30:45 -07:00
Travis Ralston
5d6e3d5711 UI refresh for uploaded files 
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
 2021-03-04 20:07:48 -07:00
Aaron Raimist
ff788ca3da Merge branch 'develop' into warn-on-access-token-reveal 2021-03-04 13:33:01 -06:00
David Baker
aaf653dd8f i18n 2021-03-04 17:58:43 +00:00
David Baker
0f1b7a001e Better error handling for streams 
Also use older youtubeStreamKey as it appears our jitsi doesn't
support the newer one.
 2021-03-04 17:52:49 +00:00
Michael Telatynski
ab4220b20d Defer auto-joining within spaces and switch to using suggested 2021-03-04 13:04:58 +00:00
Panagiotis
725162ee00 fix: i18n strings 2021-03-04 00:09:00 +02:00
Panagiotis
ae08f74336 feat: improve "view source" 
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
 2021-03-03 22:38:30 +02:00
David Baker
d8483ddf0d Don't place another call if there's already one ongoing 
The 'call' button doesn't turn into a hangup button as soon as there's
a call in the room, but we should have been doing this anyway.
 2021-03-03 20:23:21 +00:00
Michael Telatynski
77cf4cf7a4
Merge pull request #5706 from matrix-org/t3chguy/spaces4.4 
Space room hierarchies
 2021-03-03 15:25:00 +00:00
Michael Telatynski
a8ff0fa75f
Merge pull request #5705 from matrix-org/t3chguy/spaces4.3 
Iterate Space view and right panel
 2021-03-03 13:37:40 +00:00
Michael Telatynski
d9a801910a Tweak spaces copy 2021-03-03 11:34:29 +00:00
Travis Ralston
c7d4dfa4f5
Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting 
Add a scroll to bottom on message sent setting
 2021-03-02 17:41:15 -07:00
Michael Telatynski
49fc053b94
Merge pull request #5704 from matrix-org/t3chguy/spaces4.2 
Initial Space Room View and Creation UX
 2021-03-02 17:17:39 +00:00
David Baker
20e57d15fd Option for audio streaming 2021-03-02 15:20:54 +00:00
J. Ryan Stinnett
a5ee029c62
Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check 
Add multi language spell check
 2021-03-02 14:38:21 +00:00
Michael Telatynski
43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski
716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Michael Telatynski
ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +00:00
Michael Telatynski
faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski
e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00:00
Šimon Brandner
831cc7eaa0
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 12:14:36 +01:00
Michael Telatynski
926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00
Michael Telatynski
dfd0aaffe3 Iterate copy for some global warning prompts for spaces 2021-03-02 09:56:43 +00:00
Michael Telatynski
8efe7dcaa1 Decorate Right Panel cards with Space header for when viewing it in that context 2021-03-02 09:54:32 +00:00
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski
483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
Michael Telatynski
d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2 
Space Store and Space Panel for Room List filtering
 2021-03-01 09:42:04 +00:00
Robin Townsend
f1fabd831c Add /spoiler command 
As a temporary measure until we have an extensible Markdown parser.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-26 20:34:01 -05:00
Travis Ralston
678ec52035 Merge branch 'develop' into fix-4963 2021-02-26 14:41:28 -07:00
Travis Ralston
01da8633d4 i18n 2021-02-26 13:50:22 -07:00
Šimon Brandner
83df645dbb
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 18:39:20 +01:00
Michael Telatynski
f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Šimon Brandner
49ea83edb9
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 08:14:27 +01:00
Michael Telatynski
0f0e6c335f
Merge pull request #5668 from matrix-org/t3chguy/spaces2 
Initial Spaces feature flag
 2021-02-25 15:38:30 +00:00
Michael Telatynski
59017fd9e4 Merge branch 't3chguy/spaces2' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces 2021-02-25 15:01:02 +00:00
Michael Telatynski
864a9974b1 Tweak spaces labs flag copy 2021-02-25 12:20:10 +00:00
Šimon Brandner
fc32ceade7
i18n 2021-02-25 11:57:39 +01:00
Šimon Brandner
7293181552
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 19:33:22 +01:00
Šimon Brandner
87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Michael Telatynski
79daf615e4 First special treatment of space-rooms 2021-02-19 14:20:57 +00:00
Michael Telatynski
a794bfdd3e
Merge pull request #5665 from matrix-org/t3chguy/spaces1 
Discard some dead code
 2021-02-19 09:50:04 +00:00
Michael Telatynski
d4df9e731d i18n 2021-02-19 00:10:47 +00:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
J. Ryan Stinnett
d643f06ff0 Tweak chat effects setting label 2021-02-17 17:28:23 +00:00
J. Ryan Stinnett
53c4a1ada5
Merge pull request #5571 from SimonBrandner/improve-layout-handling 
Use a more generic layout setting - useIRCLayout → layout
 2021-02-17 11:02:26 +00:00
J. Ryan Stinnett
d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
Šimon Brandner
daff94ecbc
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:47:33 +01:00
Jason Robinson
23140a84ff Remove host signup config strings, make translatable instead 
Also replace the icon in the UserMenu and change the text, requested from design.
 2021-02-10 13:38:32 +02:00
Jason Robinson
d2f3192d10 Update i18n strings 2021-02-09 12:45:13 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Marco Zehe
890bb5b9eb Give breadcrumbs toolbar an accessibility label. 
Fixes vector-im/element-web#16406.

Signed-off-by: Marco Zehe <marco@marcozehe.de>
 2021-02-08 16:58:18 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
David Baker
cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
J. Ryan Stinnett
15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers 
Add option to hide the stickers button in the composer
 2021-02-04 17:01:23 +00:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
Michael Telatynski
accd2492a3 i18n 2021-02-02 13:01:57 +00:00
Michael Telatynski
5d86c2f8e0 Better errors for SSO failures 2021-02-01 16:42:58 +00:00
J. Ryan Stinnett
0cb1d1dc95 Tweak mobile guide toast copy 2021-01-29 15:30:13 +00:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes 
Improve SSO auth flow
 2021-01-29 13:28:53 +00:00
J. Ryan Stinnett
b8e3908ee2
Merge pull request #5586 from matrix-org/jryans/maybe-mobile 
Add optional mobile guide toast
 2021-01-29 11:18:08 +00:00
J. Ryan Stinnett
2996ceca52 Add optional mobile guide toast 
This adds an optional toast which Element deployments can enable to nudge users
towards the mobile apps once they are inside the app.

Part of https://github.com/vector-im/element-web/issues/16283
 2021-01-28 17:21:36 +00:00
J. Ryan Stinnett
f113748520
Merge pull request #5540 from SimonBrandner/dm-conversion-commands 
Add commands for DM conversion
 2021-01-28 16:17:07 +00:00
Travis Ralston
310a2e9b2a
Merge pull request #5580 from matrix-org/travis/widgets/oidc-verif-diag 
Run a UI refresh over the OIDC Exchange confirmation dialog
 2021-01-28 07:47:11 -07:00
J. Ryan Stinnett
5431dc7331
Merge pull request #5548 from SimonBrandner/add-search-shortcut 
Add optional search shortcut
 2021-01-28 12:33:32 +00:00
Michael Telatynski
1761a4ec80 Improve SSO UIA 
Fixes Fallback UIA postmessage interface
Auto-closes SSO UIA tab when the user has completed the flow within it
Error for when auth stage is restarted because it failed
 2021-01-28 10:45:29 +00:00
Travis Ralston
db346d129b Run a UI refresh over the OIDC Exchange confirmation dialog 2021-01-27 13:13:44 -07:00
Will Hunt
27724a93d2 new strings 2021-01-27 11:42:36 +00:00
Šimon Brandner
554c18cabd
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-26 13:36:47 +01:00
Šimon Brandner
e2abbf9a7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 08:12:32 +01:00
Travis Ralston
a779951512
Merge pull request #5553 from matrix-org/travis/widget-layout 
Support room-defined widget layouts
 2021-01-21 13:22:52 -07:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key 
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
 2021-01-21 17:46:02 +00:00
Šimon Brandner
828d401c6c
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 17:37:22 +01:00
Travis Ralston
04d1f5dd28 Implement a "Copy my layout to the room" button 2021-01-18 20:42:21 -07:00
Travis Ralston
5b5c338200 Render layout changes in the timeline 2021-01-18 19:31:11 -07:00
Travis Ralston
83fb698bbc
Merge pull request #5527 from matrix-org/travis/widget-nav 
Wire up MSC2931 widget navigation
 2021-01-18 09:09:32 -07:00
Will Hunt
e9d2daab8f fix strings 2021-01-18 13:09:39 +00:00
Will Hunt
74b5febb9c oops strings 2021-01-18 11:38:49 +00:00
Will Hunt
d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-18 11:36:46 +00:00
Will Hunt
461c0733d9 Revert strings 2021-01-18 11:36:35 +00:00
Šimon Brandner
fb60ba3482
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-17 16:45:29 +01:00
Travis Ralston
ea61c979f9 Try a different string 2021-01-16 23:29:27 -07:00
Travis Ralston
bebcabcde4 Merge branch 'develop' into travis/widget-nav 2021-01-16 23:28:11 -07:00
Jason Robinson
158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00
Šimon Brandner
948279ee9c
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-13 15:32:52 +01:00
Aaron Raimist
d479d97e2c
Rename recovery-key.txt to security-key.txt 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-12 16:05:40 -06:00
Travis Ralston
a8d878dc48
Merge pull request #5528 from matrix-org/travis/widget-devtools 
Add a basic widget explorer to devtools (per-room)
 2021-01-11 11:00:08 -07:00
Jason Robinson
2b98f14242 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-11 11:16:03 +02:00
Šimon Brandner
5a42c3f335
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:18:10 +01:00
Will Hunt
000a69765c Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-08 18:03:36 +00:00
Šimon Brandner
640e6d68b3
Merge branch 'develop' into fix-screen-sharing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:06 +01:00
David Baker
2d37151750
Merge pull request #5523 from matrix-org/dbkr/dial_pad 
Add a dialpad UI for PSTN lookup
 2021-01-05 17:23:34 +00:00
David Baker
470756546c
Merge pull request #5494 from matrix-org/dbkr/call_transfer 
Basic call transfer initiation support
 2021-01-05 17:22:22 +00:00
Jason Robinson
2224607fa8 Running gen-i18n.js seems to be the right way sync i18n string 2021-01-05 15:26:08 +02:00
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