David Baker
eab764a3c8
Vary resume link text
...
Use 'Switch' if unholding that call would hold another
2020-12-18 19:35:41 +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
Michael Telatynski
8593845e3d
i18n
2020-12-02 15:12:16 +00: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
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
Šimon Brandner
eb64e5b2af
Merge branch 'develop' into feature-change-password-validation
2020-11-27 14:46:08 +01: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
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
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