David Baker
4a009d480d
Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui
2020-12-08 11:48:14 +00:00
Travis Ralston
603a1c8ffb
Fix linter
2020-12-07 15:37:26 -07:00
Travis Ralston
550a5220d9
Undocumented linter cleanup
2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e
Merge remote-tracking branch 'origin/develop' into feature_confetti#14676
2020-12-07 14:58:56 -07:00
David Baker
747d743bd0
Add 60% opacity black over the avatars when on hold
2020-12-07 16:22:57 +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
David Baker
3b25a3be98
Smaller avatar, more padding on text
2020-12-07 15:42:35 +00:00
Lukas
a856484139
Fix typos in some strings
...
This commit fixes some typos that I've stumbled upon.
2020-12-06 10:32:52 +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
Michael Telatynski
b200211660
Merge pull request #5465 from matrix-org/t3chguy/socials
...
Fix React complaining about unknown DOM props
2020-12-03 15:20:16 +00:00
Michael Telatynski
1afece9a14
Fix React complaining about unknown DOM props
2020-12-03 12:20:48 +00:00
Michael Telatynski
e4b929c6f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882
2020-12-03 11:42:47 +00:00
Michael Telatynski
f432d4e394
delint
2020-12-03 11:31:14 +00:00
Michael Telatynski
3223b00028
Jump to home page when leaving a room
...
so that you don't get thrown into a room you may be ignoring on purpose
2020-12-03 11:15:55 +00:00
Michael Telatynski
0fd9b55b95
Fix SSO buttons for Social Logins
2020-12-03 11:08:16 +00:00
Michael Telatynski
3fda7e3f46
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-12-02 15:08:13 +00:00
Travis Ralston
bd1de8d45b
Require a room ID for WidgetStore's pinned widget contracts
...
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.
Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
2020-12-01 13:05:48 -07:00
nurjinn jafar
111515e794
fixed linter problem
2020-12-01 17:37:28 +01:00
Michael Telatynski
eb25c39318
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
...
Conflicts:
src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
nurjinn jafar
1bf7ff8994
null check added
...
path to confetti fixed after refactoring
2020-12-01 17:15:02 +01: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
anonym
b1b0e93d5e
Update i18n for Appearance User Settings
...
The variable has to be added to the i18n files as well (I don't know how to do that)
2020-11-30 21:33:52 +01:00
Michael Telatynski
d4ed4a135c
Merge pull request #5442 from RinkiyaKeDad/avatar-fix
...
Fixed Avatar for 3PID invites
2020-11-30 09:49:05 +00:00
Steffen Kolmer
0e53e220d0
Fixed copy paste error
2020-11-27 17:25:34 +01:00
nurjinn jafar
82023dcf42
Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676
2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044
refactored effects dir and changed effects exported name
2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182
Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676
2020-11-27 16:20:35 +01:00
Travis Ralston
ced68a6fbc
Merge pull request #5447 from matrix-org/travis/fix-stickerpicker
...
Fix the stickerpicker
2020-11-27 07:06:35 -07:00
Šimon Brandner
eb64e5b2af
Merge branch 'develop' into feature-change-password-validation
2020-11-27 14:46:08 +01: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
Arsh Sharma
cb3b8b6c77
fix(EventTile): updated comment
2020-11-27 14:13:42 +05:30
Travis Ralston
80f1df6d95
Don't needlessly persist user widgets
...
Fixes https://github.com/vector-im/element-web/issues/15842
We don't have a concept of a stickerpicker staying on screen, so don't make it a thing yet.
2020-11-26 15:09:08 -07:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676
2020-11-26 18:21:28 +01:00
Šimon Brandner
acd148d807
Remove nonsense lines
2020-11-26 16:58:34 +01:00
Michael Telatynski
5f03cbd88f
Iterate PR some more
2020-11-26 15:45:15 +00:00
Michael Telatynski
86025459f4
Remove unused dialog, todo comments and other tiny tweaks
2020-11-26 15:01:12 +00:00
David Baker
2a02e57a95
Add UI for hold functionality
2020-11-26 14:35:09 +00:00
Arsh Sharma
8386e50240
fix(EventTile): commited suggestions
2020-11-26 17:18:11 +05:30
Travis Ralston
fc820c4b1a
Construct modal widgets in the same way we do any other widget
...
Fixes https://github.com/vector-im/element-web/issues/15800
2020-11-25 18:51:27 -07:00
Travis Ralston
51f6205258
Fix modal buttons not being disabled by disabling them
...
Looks like this was just a missed block of code, but also the important bit.
Fixes https://github.com/vector-im/element-web/issues/15801
2020-11-25 18:48:18 -07:00
Travis Ralston
5da27aed94
Replace the concept of a Widget Security Key with an OIDC state
...
The security key naming/practice was misguided, so let's call it what it is (a settings key) and abstract away the complexity to a new store.
Fixes https://github.com/vector-im/element-web/issues/15820 while we're here.
2020-11-25 18:39:11 -07:00
Michael Telatynski
c4084196d1
delint
2020-11-25 10:39:44 +00:00
Michael Telatynski
1b1c482f9c
Iterate tests
2020-11-25 10:22:16 +00:00
Michael Telatynski
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
Michael Telatynski
6a315e80b6
Improve auth error messages
2020-11-25 09:24:24 +00:00
Michael Telatynski
225d541487
Extend Field and InfoDialog with more configurability
2020-11-25 09:19:08 +00:00
