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

17517 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
2d4c2b76d9 Merge branch 'develop' into travis/is-account-data 2019-08-19 10:36:42 -06:00
Travis Ralston
95bd41aac7
Merge pull request #3317 from matrix-org/travis/terms/inline-is-only 
Prompt for terms of service on identity server changes
 2019-08-19 10:35:58 -06:00
Travis Ralston
855bf3ad0d Import createClient instead 2019-08-19 10:28:04 -06:00
Travis Ralston
32abfbbfc6 Rename functions 2019-08-19 10:27:57 -06:00
David Baker
6879ddd34c
Merge pull request #3323 from matrix-org/dbkr/add_3pid_without_is 
Allow 3pids to be added with no ID server set
 2019-08-19 17:02:56 +01:00
David Baker
fa58fb7fdd
Merge pull request #3324 from matrix-org/dbkr/threepid_remove_design 
Fix up remove threepid confirmation UX
 2019-08-19 16:05:15 +01:00
J. Ryan Stinnett
8a7b43fd1a Tweak Settings padding / margin slightly 
This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554 will
soon take a holistic view on the problem, so this is a more conservation
temporary change.
 2019-08-19 15:45:04 +01:00
David Baker
93af6cfd8d Fix up remove threepid confirmation UX 
Probably still not the best design but hopefully break fewer UX rules:

1. Use red to confirm delete rather than cancel and green to cancel
2. Show the action you're about to perform in the confirmation
3. Label confirmation button with the action rather than yes/no.
 2019-08-19 15:37:12 +01:00
David Baker
c1b72fd346 Allow 3pids to be added with no ID server set 
Fixes https://github.com/vector-im/riot-web/issues/10573
 2019-08-19 15:17:14 +01:00
J. Ryan Stinnett
f9e223aec7
Merge pull request #3322 from matrix-org/jryans/discovery-without-is 
Improve Discovery section when no IS set
 2019-08-19 15:02:11 +01:00
J. Ryan Stinnett
5af9bf7b80 Use designed text for new IS field 2019-08-19 14:44:53 +01:00
J. Ryan Stinnett
7cc27beb44 Remove custom font size for IM URL 
As best as I can tell, the designs call for the IM URL to be the same size as
other subheadings. The font size in Zeplin doesn't match what is currently used
in Settings, so this likely caused confusion.
 2019-08-19 14:34:22 +01:00
J. Ryan Stinnett
d4ecb99d11 Show the default IS as a placeholder in Settings 
This changes the UX for the set IS field to show the default IS as a placeholder
value (as opposed to an initial value as if the user had actually entered it).

Fixes https://github.com/vector-im/riot-web/issues/10528
 2019-08-19 14:20:01 +01:00
J. Ryan Stinnett
07826c5675 Hide 3PID discovery sections when no identity server 
This hides the email and phone sections of Discovery in the Settings when there
is no IS, as they can't meaningfully be used.

Part of https://github.com/vector-im/riot-web/issues/10528
 2019-08-19 14:03:43 +01:00
David Baker
cd26b73386
Merge pull request #3319 from matrix-org/dbkr/allow_pw_reset_no_is 
Allow password reset without an ID Server
 2019-08-19 11:41:38 +01:00
David Baker
2a626c3f7c
Merge pull request #3318 from matrix-org/dbkr/allow_register_email_no_is 
Allow registering with email if no ID Server
 2019-08-19 11:18:30 +01:00
David Baker
cf1b7ab342
Merge pull request #3321 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-08-19 10:19:37 +01:00
Tuomas Hietala
f130335169 Translated using Weblate (Finnish) 
Currently translated at 98.6% (1712 of 1737 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-08-19 08:44:46 +00:00
Jeff Huang
f32c4de1f5 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1737 of 1737 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-19 08:44:45 +00:00
MorbidMind
32a402322e Translated using Weblate (Polish) 
Currently translated at 71.4% (1241 of 1737 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-18 18:08:17 +00:00
Kévin C
37a247613e Translated using Weblate (French) 
Currently translated at 100.0% (1737 of 1737 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-18 18:08:16 +00:00
Travis Ralston
51946d2a74 Persist and maintain identity server in account data 
Fixes https://github.com/vector-im/riot-web/issues/10094

MSC: https://github.com/matrix-org/matrix-doc/pull/2230
 2019-08-16 13:10:41 -06:00
Travis Ralston
3228062954 Merge branch 'travis/terms/inline-is-only' into travis/is-account-data 2019-08-16 12:45:40 -06:00
Weblate
d9aa8139bd Merge branch 'origin/develop' into Weblate. 2019-08-16 18:19:30 +00:00
Michael Telatynski
a96df333e9
Merge pull request #3310 from matrix-org/t3chguy/fix_reply_parent_redacted 
Fix showing events which were replied to and then redacted
 2019-08-16 19:19:25 +01:00
David Baker
dbe5c2cb45 Allow password reset without an ID Server 
If the server advertises that it supports doing so

Requires matrix-org/matrix-js-sdk#1018
Requires matrix-org/matrix-js-sdk#1019
Fixes vector-im/riot-web#10572
 2019-08-16 18:11:24 +01:00
Travis Ralston
de3c489fba Fix i18n 2019-08-16 09:41:23 -06:00
Travis Ralston
2456912ec7 Merge remote-tracking branch 'origin/develop' into travis/terms/inline-is-only 2019-08-16 09:41:00 -06:00
David Baker
a87fb7eaa2 also remove from comment 2019-08-16 15:36:41 +01:00
David Baker
3c4c595f79 remove old serverCaps 2019-08-16 15:27:11 +01:00
David Baker
41a9db3224 Use new flag in /versions 2019-08-16 15:07:15 +01:00
Weblate
ba653a30db Merge branch 'origin/develop' into Weblate. 2019-08-16 13:31:42 +00:00
albanobattistella
c917463da8 Translated using Weblate (Italian) 
Currently translated at 97.9% (1696 of 1733 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-08-16 13:31:42 +00:00
Osoitz
c90e4ab4a3 Translated using Weblate (Basque) 
Currently translated at 100.0% (1733 of 1733 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-08-16 13:31:41 +00:00
Travis Ralston
218bee8071
Merge pull request #3316 from matrix-org/travis/terms/inline-im-is 
Prompt for terms of service on integration manager changes
 2019-08-16 07:31:36 -06:00
David Baker
19c7a4627d fix test 2019-08-16 12:24:52 +01:00
David Baker
e705d110af Allow registering with email if no ID Server 
If the server advertises that it supports doing so

This version uses a random me.dbkr prefix until the MSC is
written.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1017
Implements https://github.com/matrix-org/matrix-doc/pull/2233
 2019-08-16 11:57:32 +01:00
Weblate
59fe6c03ae Merge branch 'origin/develop' into Weblate. 2019-08-16 09:56:44 +00:00
Kévin C
9c12791f37 Translated using Weblate (French) 
Currently translated at 100.0% (1732 of 1732 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-16 09:56:44 +00:00
Osoitz
ae9039ab2c Translated using Weblate (Basque) 
Currently translated at 98.4% (1705 of 1732 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-08-16 09:56:44 +00:00
David Baker
cde1944cac
Merge pull request #3314 from matrix-org/dbkr/warn_if_bound_threepids 
Warn on disconnecting from IS
 2019-08-16 10:56:39 +01:00
Travis Ralston
02f8b72533 tfw the linter finds bugs for you 2019-08-15 16:08:18 -06:00
Travis Ralston
9860baf0b4 Prompt for terms of service on identity server changes 
Part of https://github.com/vector-im/riot-web/issues/10539
 2019-08-15 16:02:02 -06:00
Travis Ralston
0acae22527 Merge branch 'travis/terms/inline-im-is' into travis/terms/inline-is-only 2019-08-15 14:41:22 -06:00
Travis Ralston
5fe691cf33 Double equals 2019-08-15 13:33:02 -06:00
Travis Ralston
e2f013ddb4 Appease the linter 
This looks awkward, but should pass.
 2019-08-15 13:31:45 -06:00
Travis Ralston
27504e1578 Prompt for terms of service on integration manager changes 
Part of https://github.com/vector-im/riot-web/issues/10539
 2019-08-15 13:28:23 -06:00
David Baker
7d96cc969a
use original bug 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-15 15:39:15 +01:00
Weblate
316ca978c2 Merge branch 'origin/develop' into Weblate. 2019-08-15 14:38:38 +00:00
David Baker
ded2297523
Merge pull request #3315 from matrix-org/dbkr/fix_set_im 
Fix set integration manager tooltip
 2019-08-15 15:38:34 +01:00