mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 03:21:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
23995 commits 219 branches 562 tags 474 MiB
Commit graph

23995 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
c7e908ddc0 Prepare changelog for v2.5.0-rc.2 2020-04-16 20:01:46 +01:00
RiotRobot
c6746e68b2 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 19:56:11 +01:00
dependabot[bot]
d05ceec9d6
Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests 
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-16 18:53:03 +00:00
Weblate
72e8281bd8 Merge branch 'origin/develop' into Weblate. 2020-04-16 18:51:43 +00:00
Travis Ralston
cd73f3736a
Merge pull request #4416 from matrix-org/travis/cross-sign-setting 
Convert cross-signing feature flag to setting
 2020-04-16 12:51:38 -06:00
Travis Ralston
4e7dd74c22
Merge pull request #4429 from matrix-org/travis/xsign-flag-rel 
[Release] Convert cross-signing flag to a setting
 2020-04-16 12:50:54 -06:00
Travis Ralston
3614170906 Disable scripts in CI too 2020-04-16 12:47:25 -06:00
Travis Ralston
22533d3e6a Disable scripts in CI too 2020-04-16 12:46:34 -06:00
Travis Ralston
c3f90ed289 Short-circuit all end to end tests 2020-04-16 12:42:42 -06:00
Travis Ralston
741368350c Track the issue number too 2020-04-16 12:42:32 -06:00
Travis Ralston
1deece3fb5 Short-circuit all end to end tests 2020-04-16 12:41:48 -06:00
Travis Ralston
4af33d91eb Track the issue number too 2020-04-16 12:26:08 -06:00
Travis Ralston
d04af1f3a8 Disable e2e tests for now 2020-04-16 12:24:04 -06:00
Travis Ralston
8b5a8f163f Disable e2e tests for now 2020-04-16 12:23:22 -06:00
Travis Ralston
2451e0b873 Wait a bit before continuing with the passphrase 
The continue button is probably no-oping due to being disabled.
 2020-04-16 12:13:35 -06:00
Travis Ralston
f4a5361b14 Wait a bit before continuing with the passphrase 
The continue button is probably no-oping due to being disabled.
 2020-04-16 12:13:05 -06:00
Travis Ralston
5769b07a92 Select the right continue button 
There's no buttons in the field.
 2020-04-16 12:04:48 -06:00
Travis Ralston
597f97e1d8 Select the right continue button 
There's no buttons in the field.
 2020-04-16 12:04:01 -06:00
Travis Ralston
2432f77b72 Blind attempt at fixing the end to end tests 2020-04-16 11:48:45 -06:00
Travis Ralston
25fa675f88 Blind attempt at fixing the end to end tests 2020-04-16 11:46:29 -06:00
Travis Ralston
45b6b95d44 Appease the linter 2020-04-16 11:27:09 -06:00
Travis Ralston
2ffb5be5cd Remove UI to change the cross-signing setting 2020-04-16 11:26:56 -06:00
Travis Ralston
b5b4bdbf3d Clean up setting definition to follow surrounding practices 
It's not perfect, but we're at least okay with it.
 2020-04-16 11:26:51 -06:00
Travis Ralston
2d395d8dd1 Convert cross-signing feature flag to setting 
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
 2020-04-16 11:26:42 -06:00
Travis Ralston
0fcaaab1d0 Appease the linter 2020-04-16 11:18:54 -06:00
Travis Ralston
54f8ba4d80 Remove UI to change the cross-signing setting 2020-04-16 11:15:12 -06:00
Travis Ralston
b5130ca5dc Clean up setting definition to follow surrounding practices 
It's not perfect, but we're at least okay with it.
 2020-04-16 11:12:47 -06:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Weblate
054098bb81 Merge branch 'origin/develop' into Weblate. 2020-04-16 16:26:09 +00:00
Besnik Bleta
65f1f7cfad Translated using Weblate (Albanian) 
Currently translated at 99.7% (2282 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-04-16 16:26:09 +00:00
Michael Telatynski
aa5573694e
Merge pull request #4428 from matrix-org/t3chguy/kegan_1 
Make RoomPublishSetting import-skinnable
 2020-04-16 17:26:01 +01:00
Michael Telatynski
e1e65a0fe1 Make RoomPublishSetting import-skinnable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 17:13:33 +01:00
J. Ryan Stinnett
c81c209d7b
Merge pull request #4426 from matrix-org/jryans/cross-signing-copy-release 
Iterate cross-signing copy
 2020-04-16 16:01:31 +01:00
Michael Telatynski
7593c8273b update PHASE_PASSPHRASE copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
d4b15da70a Fixxy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
14910c6e80 iterate copy some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
84e8e22616 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
0e72aef1e3 update Create SSSS Dialog copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
da5c8b5657 further tweaks by Matthew 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
7236397e5f Replace Verify this session and Complete security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
498ac2e0fc Copy tweaks with Nad 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Michael Telatynski
d17e54c1cf Use recovery passphrase and recovery key everywhere 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 15:49:17 +01:00
Weblate
7127cdb27d Merge branch 'origin/develop' into Weblate. 2020-04-16 14:31:42 +00:00
rkfg
765205869a Translated using Weblate (Russian) 
Currently translated at 90.1% (2065 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-16 14:31:42 +00:00
random
9de8adc7af Translated using Weblate (Italian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-04-16 14:31:42 +00:00
J. Ryan Stinnett
94ace258f3
Merge pull request #4425 from matrix-org/t3chguy/recovery_copy 
Iterate cross-signing copy
 2020-04-16 15:31:35 +01:00
Michael Telatynski
aea7ede7d0 update PHASE_PASSPHRASE copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:55:43 +01:00
Michael Telatynski
e942a35525 Fixxy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:09:41 +01:00
Michael Telatynski
af59c1b5b3 iterate copy some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:02:32 +01:00
Michael Telatynski
8c8509a603 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:48:52 +01:00