PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
23020 commits 1 branch 0 tags 338 MiB
Commit graph

23020 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
538147f7fa Better support for widgets overriding their URLs 
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
 2020-04-01 10:00:33 +01:00
Travis Ralston
6d0d77f98e Disable the linter on lines it complaints about UNSAFE_componentWillMount 2020-03-31 14:21:12 -06:00
Travis Ralston
0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings 
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
 2020-03-31 14:15:23 -06:00
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible 
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
 2020-03-31 14:14:17 -06:00
Travis Ralston
c86d75693b Fix a number of minor code quality issues 
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
 2020-03-31 14:05:56 -06:00
Märt Põder
a0e5169b59 Added translation using Weblate (Estonian) 2020-03-31 19:48:13 +00:00
Weblate
9b8d4ebdbb Merge branch 'origin/develop' into Weblate. 2020-03-31 16:04:37 +00:00
Michael Telatynski
56dda3895c
Merge pull request #4302 from matrix-org/t3chguy/cmds 
rework SlashCommands to better expose aliases
 2020-03-31 17:04:31 +01:00
Travis Ralston
64c11c3565 Move ssoUrl to a class property 2020-03-31 09:26:17 -06:00
Weblate
1e4fff5d51 Merge branch 'origin/develop' into Weblate. 2020-03-31 15:18:21 +00:00
Michael Telatynski
c75475f3f5
Merge pull request #4311 from matrix-org/t3chguy/fix_els 
Fix EventListSummary when RR rendering is disabled
 2020-03-31 16:18:16 +01:00
Weblate
050921e1f2 Merge branch 'origin/develop' into Weblate. 2020-03-31 15:00:16 +00:00
random
dcd75a801e Translated using Weblate (Italian) 
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-31 15:00:16 +00:00
Jorik Schellekens
6da01a9cf7
Merge pull request #4299 from JorikSchellekens/joriks/css-location 
Update link to css location.
 2020-03-31 16:00:11 +01:00
Hubert Chathi
6596b7223a Merge branch 'develop' into uhoreg/check_sssss_passphrase 2020-03-31 10:39:56 -04:00
Travis Ralston
4a9bc5e5bf
Update src/components/views/auth/InteractiveAuthEntryComponents.js 
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
 2020-03-31 08:29:42 -06:00
Jorik Schellekens
e2685b1cf0 Licensing info 2020-03-31 15:29:40 +01:00
Jorik Schellekens
6cf9166c4a Use variables for the rem values. 
It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
 2020-03-31 15:26:23 +01:00
Weblate
77f636c74b Merge branch 'origin/develop' into Weblate. 2020-03-31 13:21:48 +00:00
Michael Telatynski
9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking 
Fix peeking keeping two timeline update mechanisms in play
 2020-03-31 14:21:42 +01:00
Michael Telatynski
2624017ab9 Also stop peeking on unmount 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 12:51:03 +01:00
Michael Telatynski
9e8a401dc8 Fix EventListSummary when RR rendering is disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 12:29:58 +01:00
Michael Telatynski
80479195c8 iterate PR based on feedback. Remove newballsplease cmd alias 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 11:53:26 +01:00
Michael Telatynski
6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds 
 Conflicts:
	src/SlashCommands.tsx
 2020-03-31 11:49:53 +01:00
Weblate
77e6cb7c6e Merge branch 'origin/develop' into Weblate. 2020-03-31 10:05:04 +00:00
J. Ryan Stinnett
223a4e285d
Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload 
Pass new secret storage key to bootstrap path
 2020-03-31 11:04:58 +01:00
J. Ryan Stinnett
24c09cc4c8 Convert secret storage key creation to object 2020-03-31 10:45:53 +01:00
Michael Telatynski
a2a9dc6cd0 Fix peeking keeping two timeline update mechanisms in play 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 10:37:56 +01:00
Weblate
8340ac35cd Merge branch 'origin/develop' into Weblate. 2020-03-31 09:07:33 +00:00
J. Ryan Stinnett
2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red 
Show red shield for users that become unverified
 2020-03-31 10:07:28 +01:00
Weblate
2d8b0ccb80 Merge branch 'origin/develop' into Weblate. 2020-03-31 08:41:27 +00:00
Jeff Huang
b44c83aad7 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2243 of 2243 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-31 08:41:27 +00:00
Michael Telatynski
c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2 
Accessibility fixed for Event List Summary and Composer Format Bar
 2020-03-31 09:41:20 +01:00
Michael Telatynski
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso 
Support $riot: Templates for SSO/CAS urls in the welcome.html page
 2020-03-31 09:39:40 +01:00
Weblate
1f8830e640 Merge branch 'origin/develop' into Weblate. 2020-03-31 02:56:35 +00:00
Michael Albert
98c663a41d Translated using Weblate (German) 
Currently translated at 77.2% (1730 of 2242 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-31 02:56:34 +00:00
Travis Ralston
2557875fd2
Merge pull request #4296 from waylon531/upstream 
Added the /html command
 2020-03-30 20:56:24 -06:00
Travis Ralston
d899576578 Appease the linter 2020-03-30 20:24:53 -06:00
Travis Ralston
8bc86deaaa Appease the style linter 2020-03-30 20:23:34 -06:00
Travis Ralston
de79520150 Add SSO dialog copy for 3PID adding (email/phone) 2020-03-30 20:18:52 -06:00
Travis Ralston
6112d92f80 Remove debugging 2020-03-30 20:11:23 -06:00
Travis Ralston
ffa75ef48c Wire up all the dialog parts for SSO, using device deletion as a POC 2020-03-30 20:03:46 -06:00
Hubert Chathi
bbb9a67ced use new method for checking key 2020-03-30 17:28:01 -04:00
Travis Ralston
b35356833f Merge branch 'develop' into travis/sso-uia 2020-03-30 14:56:52 -06:00
J. Ryan Stinnett
690b5945d0 Pass new secret storage key to bootstrap path 
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.

Fixes https://github.com/vector-im/riot-web/issues/12867
 2020-03-30 21:40:11 +01:00
waylon531
9cf82d8743
Updated strings 
I added a new string for the /html command and had to regerate strings
for i18

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-03-30 11:44:34 -07:00
waylon531
dd4331cd18
Added the /html command 
This command lets you send html messages through riot. This is
incredibly useful for doing advanced formatting not supported by
markdown and lets riot support even more html tags.

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-03-30 11:44:08 -07:00
Weblate
f8051f9f6f Merge branch 'origin/develop' into Weblate. 2020-03-30 18:13:22 +00:00
Damir Jelić
930f93b974 Merge branch 'poljar/event-index-log-skipped-events' into develop 2020-03-30 20:12:51 +02:00
Weblate
1e2b175612 Merge branch 'origin/develop' into Weblate. 2020-03-30 18:08:35 +00:00