mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-25 02:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
21138 commits 203 branches 553 tags 407 MiB
Commit graph

21138 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
1747a62118 add missing awaits 2020-01-23 11:55:08 +00:00
Weblate
7396430c46 Merge branch 'origin/develop' into Weblate. 2020-01-23 11:51:37 +00:00
David Baker
8d59cb4632
Merge pull request #3903 from matrix-org/dbkr/bootstrap_visuals_1 
Updated visuals for cross-signing bootstrap
 2020-01-23 11:51:32 +00:00
Michael Telatynski
873952a83e delint 2020-01-23 11:51:31 +00:00
Michael Telatynski
6c3ac2d0c4 Add Reject & Ignore user button to invites view 2020-01-23 11:50:59 +00:00
Damir Jelić
4953f32cba ManageEventIndex: Rename the enable crawler setting. 2020-01-23 12:26:26 +01:00
Damir Jelić
9bee024da7 ManageEventIndex: Remove some useless divs and add the enable case. 2020-01-23 12:24:06 +01:00
Damir Jelić
0d545ed335 EventIndexPeg: Small refactor and change the init logic. 
This changes the way the event index is initialized, if it's disabled in
the settings it will not be initialized at all, before only the crawler
loop was not being started.
 2020-01-23 12:23:23 +01:00
Michael Telatynski
13bb719a89 Add comment for operations loop 2020-01-23 11:22:22 +00:00
Zoe
a409b9b96f whoops, left some printfs 2020-01-23 11:14:01 +00:00
Zoe
ee33c7cd62 lint 2020-01-23 11:10:39 +00:00
David Baker
10db79bb93 Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1 2020-01-23 11:05:21 +00:00
Weblate
f3a846dfff Merge branch 'origin/develop' into Weblate. 2020-01-23 11:04:58 +00:00
Balázs Meskó
5d8249507c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-23 11:04:57 +00:00
Kévin C
f7ca8a1b84 Translated using Weblate (French) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-23 11:04:56 +00:00
Jeff Huang
8218962c37 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-23 11:04:56 +00:00
David Baker
442b8be459
Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui 
Implement some parts of new cross signing bootstrap UI
 2020-01-23 11:04:49 +00:00
Zoe
d68db74efe Room list reflects encryption state 2020-01-23 10:46:05 +00:00
Damir Jelić
5fd121d2af ManageEventIndex: Remove the unused stats. 2020-01-23 11:44:56 +01:00
David Baker
c0b7132404 Different copy on done screen if we setup from scratch 2020-01-23 10:18:08 +00:00
Damir Jelić
4627e3b282 EventIndex: Refactor out the addInitialCheckpoints method. 2020-01-23 11:02:44 +01:00
Travis Ralston
65450e893c Try and fix e2e tests for new invite dialog 2020-01-22 22:40:02 -07:00
Travis Ralston
3541ef2889 Merge branch 'travis/user-lists-suggestions' into travis/user-lists-labs 2020-01-22 22:38:25 -07:00
Travis Ralston
e41f94bdb7 Try to populate user IDs even when the server's directory fails us 
Fixes https://github.com/vector-im/riot-web/issues/11943
 2020-01-22 22:33:50 -07:00
Travis Ralston
a196ecc891 Fix i18n 2020-01-22 21:17:40 -07:00
Travis Ralston
139b5663fe Remove user lists feature flag, making it the default 
Fixes https://github.com/vector-im/riot-web/issues/11201
 2020-01-22 21:14:53 -07:00
Travis Ralston
054ebb9458 Fix scrollable area and padding in user lists dialog 2020-01-22 21:07:29 -07:00
Weblate
c86f0795bd Merge branch 'origin/develop' into Weblate. 2020-01-23 01:06:48 +00:00
J. Ryan Stinnett
1fdd155dd2
Merge pull request #3904 from matrix-org/jryans/report-admin-external-links 
Treat links as external in report content admin message
 2020-01-23 01:06:42 +00:00
J. Ryan Stinnett
a504faa2f6 Treat links as external in report content admin message 
This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab.
 2020-01-22 22:08:37 +00:00
Weblate
d2d5c446e7 Merge branch 'origin/develop' into Weblate. 2020-01-22 21:14:31 +00:00
Michael Telatynski
7a028af359
Merge pull request #3902 from matrix-org/t3chguy/free_the_svg 
Be consistent about our settings svg, free the other one
 2020-01-22 21:14:25 +00:00
Weblate
523e6c7509 Merge branch 'origin/develop' into Weblate. 2020-01-22 20:57:27 +00:00
catborise
78ed8019d4 Translated using Weblate (Turkish) 
Currently translated at 72.6% (1482 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-22 20:57:27 +00:00
Szimszon
cf5673be17 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-22 20:57:24 +00:00
David Baker
a95cde106f
Merge pull request #3899 from matrix-org/dbkr/npm_prepare 
Change prepublish script to prepare
 2020-01-22 20:57:18 +00:00
David Baker
30b0663eb0 lint 2020-01-22 18:15:35 +00:00
David Baker
78654cc693 Updated visuals for cross-signing bootstrap 
* Use Fields rather than plain inputs
 * Update padding & alignment to match designs
 * Add Skip buttons
 * Update copy as per designs

Part of https://github.com/vector-im/riot-web/issues/11902
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897
 2020-01-22 18:08:39 +00:00
Michael Telatynski
b7d1c17ad1 simple optimization to bail out of check on first failure 2020-01-22 16:56:27 +00:00
Michael Telatynski
9706114bb5 move E2E_STATE to E2EIcon to simplify imports 2020-01-22 16:54:31 +00:00
Michael Telatynski
33b5d42c06 Be consistent about our settings svg, free the other one 2020-01-22 15:34:17 +00:00
Damir Jelić
c3418df919 FilePanel: Remove whitespace before two function definitions. 2020-01-22 16:31:49 +01:00
Damir Jelić
c5e8753b05 FilePanel: Don't import the whole of the js-sdk. 2020-01-22 16:26:40 +01:00
Weblate
186def976f Merge branch 'origin/develop' into Weblate. 2020-01-22 15:26:26 +00:00
David Baker
2e0977fb0c
Merge pull request #3901 from matrix-org/dbkr/kill_react_sdk_version 
Remove the react-sdk version
 2020-01-22 15:26:22 +00:00
Weblate
b4116d8abd Merge branch 'origin/develop' into Weblate. 2020-01-22 15:26:06 +00:00
Michael Telatynski
cd412b1df4
Merge pull request #3900 from matrix-org/t3chguy/buildkite 
BuildKite: Retry end-to-end tests automatically once if they fail
 2020-01-22 15:26:01 +00:00
Damir Jelić
f917c2faea FilePanel: Listen for live events and add them to an open FilePanel. 2020-01-22 16:21:11 +01:00
David Baker
7e52eb9f65 Unused import 2020-01-22 15:16:41 +00:00
David Baker
c04872dd9b i18n 2020-01-22 15:12:38 +00:00