mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
23003 commits 214 branches 561 tags 414 MiB
Commit graph

23003 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Michael Telatynski
6517ed07bd
Merge pull request #4307 from matrix-org/t3chguy/fixes1111 
Field: mark id as optional in propTypes
 2020-03-30 19:08:29 +01:00
Michael Telatynski
147e7bc57e Field: mark id as optional in propTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 18:42:47 +01:00
Weblate
fd593280e0 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:20:54 +00:00
Travis Ralston
b5688ac2b6
Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button 
Fix view community link icon contrast
 2020-03-30 11:20:49 -06:00
Weblate
b5587ea853 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:08:55 +00:00
Travis Ralston
df60f9cd26
Merge pull request #4304 from matrix-org/travis/fix-confs 
Remove underscore from Jitsi conference names
 2020-03-30 11:08:49 -06:00
Travis Ralston
ca5d540311 Remove underscore from Jitsi conference names 
Fixes https://github.com/vector-im/riot-web/issues/12929

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
 2020-03-30 10:40:26 -06:00
J. Ryan Stinnett
520b4c3e65 Add tests for was verified case 2020-03-30 16:33:22 +01:00
J. Ryan Stinnett
b53b5cc45d Add wasCrossSigningVerified in test 2020-03-30 15:24:43 +01:00
J. Ryan Stinnett
a3555cacea Merge remote-tracking branch 'origin/develop' into jryans/id-change-red 2020-03-30 14:52:22 +01:00
Weblate
28356345fc Merge branch 'origin/develop' into Weblate. 2020-03-30 13:23:19 +00:00
Zoe
4e8cec354d
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields 
Refactor shield display logic; changed rules for DMs
 2020-03-30 14:23:13 +01:00
Michael Telatynski
559b8e174b undo accidental changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 14:13:08 +01:00
Michael Telatynski
c6d69f3d3f de-tslint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 14:09:10 +01:00
Michael Telatynski
8c2b910c03 rework SlashCommands to better expose aliases 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 13:59:08 +01:00
Damir Jelić
836b348bff EventIndex: Add a trailing comma. 2020-03-30 14:49:28 +02:00