Šimon Brandner
bebbb3b90e
Merge branch 'develop' into improve-file-drop-ui
2020-12-17 20:22:48 +01:00
Šimon Brandner
e70dee08d0
Fix flickering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-17 19:50:59 +01:00
Šimon Brandner
dcb30b72b0
Fix left panel resizer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-17 13:25:22 +01:00
Jason Robinson
5aa24b97cd
Merge remote-tracking branch 'origin/develop' into jaywink/elementPro
2020-12-16 14:45:16 +02:00
Michael Telatynski
4c2b6f410b
fix tests
2020-12-16 10:41:56 +00:00
Hubert Chathi
983ffe98ff
Merge pull request #5483 from uhoreg/web_pickle
...
Use random pickle key on all platforms
2020-12-15 12:56:41 -05:00
Jason Robinson
cd836be809
Rename everything HostingSignup -> EMSElementPro
...
This setup flow ended up quite specific due to all the various moving parts.
2020-12-15 10:50:38 +02: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
f987908d04
Merge pull request #5446 from matrix-org/dbkr/hold_ui
...
Add UI for hold functionality
2020-12-10 12:30:59 +00:00
Travis Ralston
80d6629c3e
delete the rest too
2020-12-09 18:50:16 -07: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
Hubert Chathi
753ec9e45a
use random pickle key on all platforms, and store access token encrypted in IDB
2020-12-09 18:40:31 -05:00
Travis Ralston
3e3a32cf10
Only show confetti if the current room is receiving an appropriate event
2020-12-09 11:56:57 -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
f30d2ff1c5
Fix confetti room unread state check
...
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
2020-12-07 16:54:09 -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
6916b5d7c6
Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui
2020-12-03 17:57:22 +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
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
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
Jason Robinson
a67ad0750d
Code styling
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:49:04 +02: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
Jason Robinson
ad49dedec3
Document hosting_signup config option in source
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
Richard Lewis
116f109a62
Improve setup initiation link
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
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
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
2f64160a0e
Remove backwards compatibility in ServerConfig for m.require_identity_server
2020-11-25 09:00:31 +00:00
Michael Telatynski
f7d7182dc9
Iterate Multi-SSO support
2020-11-24 12:09:11 +00:00