imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31121 commits 222 branches 563 tags 470 MiB
Commit graph

9163 commits

Author SHA1 Message Date
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
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
macekj
27a853c586 use textSerialize function to get model text 2020-12-02 15:01:44 -05: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
Jason Robinson
31c7c05f2e Convert ConfirmCloseHostingSignupDialog to typescript 2020-12-02 11:12:45 +02: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
Jason Robinson
c03a50e34b
Semiclon 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:51:46 +02:00
Jason Robinson
8f7b012ec1
Interface syntax 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:50:58 +02:00
Jason Robinson
85ce95e066
Interface syntax 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:50:42 +02:00
Jason Robinson
f112f4fcef
Method scoping 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:49:47 +02: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
David Baker
cb6c080828 Fix remote video being too tall and causing aux panel to scroll 2020-11-30 16:44:31 +00: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
macekj
200c061968 remove unnecessary plus checks in emoji regexes 
Signed-off-by: macekj <macekj@umich.edu>
 2020-11-27 19:41:45 -05: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
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
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
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
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
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
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