Commit graph

13392 commits

Author SHA1 Message Date
Šimon Brandner
f0bbed0c44 Allow default value 2020-11-29 12:17:07 +01:00
Šimon Brandner
5e4f9907cf Added persistance 2020-11-28 19:39:09 +01:00
Šimon Brandner
aba5ef100f Merge branch 'develop' into feature-multi-language-spell-check 2020-11-28 19:18:17 +01:00
macekj
200c061968 remove unnecessary plus checks in emoji regexes
Signed-off-by: macekj <macekj@umich.edu>
2020-11-27 19:41:45 -05: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
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
ad49dedec3 Document hosting_signup config option in source 2020-11-27 15:10:35 +02:00
Jason Robinson
835e417333 Translate all the strings 2020-11-27 15:10:35 +02:00
Jason Robinson
5ad9b83870 Fix copyright strings 2020-11-27 15:10:35 +02:00
Jason Robinson
94fba82227 Fix hostingSignupIFrame rendering in UserMenu after latest develop changes 2020-11-27 15:10:35 +02:00
Jason Robinson
c818a719bf Try a slightly larger HostingSignupDialog
Make HostingSignupBaseDialog larger
2020-11-27 15:10:35 +02:00
Jason Robinson
2aa36acae0 Change some messageHandler actions
setup_complete does not close the dialog but
just allows marking the setup as completed.

close_dialog closes the dialog immediately.
2020-11-27 15:10:35 +02:00
Richard Lewis
116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
Jason Robinson
d089eb720f Remove the signup iframe link text from the ProfileSettings.js 2020-11-27 15:10:35 +02:00
Jason Robinson
d607999cff Send also domain and user localpart to HostingSignupDialog iframe 2020-11-27 15:10:35 +02:00
Jason Robinson
b3b3f5ebeb Fix HostingSignupDialog layouting inside dialog 2020-11-27 15:10:35 +02:00
Jason Robinson
1e699b7ef3 Enable token request for HostingSignupDialog
Needed for the last part of setup which is triggering
a migration process to the new host.
2020-11-27 15:10:35 +02:00
Jason Robinson
a37e0db3e1 Move HostingSignupDialog to the dialogs folder 2020-11-27 15:10:35 +02:00
Jason Robinson
e6582c140f Dont' allow HostingSignupDialog to close
Except via confirmed cancel action or host setup success postmessage.
2020-11-27 15:10:35 +02:00
Jason Robinson
a1d750a4aa Rename a few things, make hosting signup config an object 2020-11-27 15:10:35 +02:00
Jason Robinson
54b22290e7 Add hosting_signup_domains for controlling which users see the hosting signup dialog 2020-11-27 15:10:35 +02:00
Jason Robinson
48fefa0d3e Implement fetching OpenID token for hosting provider iframe
And then pass it via postMessage when requested.

Send whole OpenID credentials object to Hosting Provider iframe
2020-11-27 15:10:35 +02:00
Jason Robinson
c7706ac3d5 Add possibility for hosting provider IFrame
Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.

Add iframe for hosting provider signup content
2020-11-27 15:10:35 +02: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
Šimon Brandner
2f988bc97f Added UI 2020-11-26 13:51:03 +01: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
Michael Telatynski
2f64160a0e Remove backwards compatibility in ServerConfig for m.require_identity_server 2020-11-25 09:00:31 +00:00
Arsh Sharma
5e239690da fix(EventTile): made revisions 2020-11-25 12:46:14 +05:30
macekj
2ffdfaef68 remove unnecessary lookbehind and comment emoticon regex
Signed-off-by: macekj <macekj@umich.edu>
2020-11-24 11:42:53 -05:00