sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
20,353 Commits 4 Branches 19 Tags
50f73ee0c5d5982b060041529439fe84d43e6fc8
Commit Graph
20353 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate 50f73ee0c5 Merge branch 'origin/develop' into Weblate. 2020-01-14 17:12:20 +00:00
David BakerandGitHub fa174512cc Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices 
Don't error on unverified/unknown devices.
 2020-01-14 17:12:14 +00:00
Weblate 3ac64244f8 Merge branch 'origin/develop' into Weblate. 2020-01-14 14:15:52 +00:00
ZoeandGitHub 1fd1e4b953 Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons 
Padlock icons in room header (behind feature_cross_signing)
 2020-01-14 14:15:46 +00:00
Weblate 8c769a9a80 Merge branch 'origin/develop' into Weblate. 2020-01-14 12:18:08 +00:00
SzimszonandWeblate b556208014 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-14 12:18:08 +00:00
Kévin CandWeblate 1542ea75c9 Translated using Weblate (French) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-14 12:18:08 +00:00
Jeff HuangandWeblate 1aec215624 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-14 12:18:07 +00:00
David BakerandGitHub f87541a6a9 Merge pull request #3822 from matrix-org/dbkr/key_backup_resign 
Don't allow upgrade from untrusted key backup.
 2020-01-14 12:18:00 +00:00
David Baker 24552f567e Add primary button to trigger restore flow 2020-01-14 11:52:00 +00:00
David Baker c91af5ae49 i18n 2020-01-14 11:33:16 +00:00
David Baker 94e4d5bf1f s/sign-in/session/ 2020-01-14 11:32:30 +00:00
David BakerGitHubJ. Ryan Stinnett
 		44ca35296a Consistent capitalisation 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-14 11:31:00 +00:00
Zoe f617fb7bbe Place RoomHeader privacy padlocks behind the crosssigning feature flag 2020-01-14 10:31:01 +00:00
David Baker 14501b748b lint again 2020-01-13 21:58:26 +00:00
David Baker 9a1be1a24d Don't try to set crypto options without crypto enabled 2020-01-13 21:54:14 +00:00
Weblate 612df68082 Merge branch 'origin/develop' into Weblate. 2020-01-13 21:33:07 +00:00
call_xzandWeblate ce85204937 Translated using Weblate (Japanese) 
Currently translated at 59.5% (1190 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-01-13 21:33:07 +00:00
SzimszonandWeblate eeee736e9f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-13 21:33:05 +00:00
J. Ryan StinnettandGitHub 9cedfeb007 Merge pull request #3825 from aaronraimist/lock 
Emoji verification: Change name of 🔒 to lock
 2020-01-13 21:32:58 +00:00
David BakerandGitHub 19777cfafc Merge pull request #3838 from matrix-org/dbkr/padlocks_behind_labs_flag 
Room padlock decorations only if cross-signing is enabled
 2020-01-13 19:27:50 +00:00
David Baker e47240d838 Lint Eastwood 2020-01-13 17:56:40 +00:00
David Baker d53016e8fc Room padlock decorations only if cross-signing is enabled 
Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
 2020-01-13 17:53:49 +00:00
David Baker 76fe87c941 Don't error on unverifie/unknownd devices. 
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
 2020-01-13 17:41:58 +00:00
Zoe 397637d59d used classnames module 2020-01-13 15:08:07 +00:00
Zoe a56bf5398d lint 2020-01-13 14:54:39 +00:00
Zoe 0bd2ecd798 lint 2020-01-13 14:51:10 +00:00
Zoe e43174c636 Show padlock in room headers for invite-only rooms 
Fixes #11832
 2020-01-13 14:49:23 +00:00
RiotRobot 389e1194ff Merge branch 'master' into develop 2020-01-13 13:09:56 +00:00
RiotRobot 8091cadc46 v1.7.6 2020-01-13 13:06:31 +00:00
RiotRobot d38c358235 Prepare changelog for v1.7.6 2020-01-13 13:06:30 +00:00
RiotRobot 9a3ca28978 js-sdk 3.0.0 2020-01-13 13:01:36 +00:00
David BakerandGitHub 280253d58a Merge pull request #3834 from matrix-org/dbkr/community-user-list-fire_rel 
Repair community member info panel
 2020-01-13 12:42:03 +00:00
David BakerandGitHub 415c8679f9 Merge pull request #3833 from matrix-org/dbkr/feature-presence-indicator_rel 
Add feature flag around the presence indicator in room list
 2020-01-13 12:41:51 +00:00
Michael TelatynskiandDavid Baker 66b55495bb Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:40:45 +00:00
J. Ryan StinnettandDavid Baker 8fc85797a7 Guard against missing members in avatars 
Part of https://github.com/vector-im/riot-web/issues/11744
 2020-01-13 12:40:40 +00:00
J. Ryan StinnettandGitHub dd652f6af3 Merge pull request #3832 from matrix-org/jryans/community-user-list-fire 
Repair community member info panel
 2020-01-13 12:38:24 +00:00
J. Ryan StinnettandDavid Baker 63e5c44c63 Add feature flag around the presence indicator in room list 
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
 2020-01-13 12:35:57 +00:00
J. Ryan Stinnett 77b479d50c Guard against missing members in avatars 
Part of https://github.com/vector-im/riot-web/issues/11744
 2020-01-13 12:29:10 +00:00
J. Ryan StinnettandGitHub 56a7b6c33e Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator 
Add feature flag around the presence indicator in room list
 2020-01-13 12:25:00 +00:00
ZoeandGitHub edd08c279c Merge pull request #3821 from matrix-org/zip/11226-padlock-icons 
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
 2020-01-13 12:20:32 +00:00
Michael TelatynskiandJ. Ryan Stinnett 9c686bf501 Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:15:54 +00:00
Zoe 878c5b5b52 removed unnecessary lint rule 2020-01-13 12:11:19 +00:00
J. Ryan Stinnett 2168e7ec0c Add feature flag around the presence indicator in room list 
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
 2020-01-13 11:48:55 +00:00
Zoe 422d4cd73a small simplification in code as .getContent() will always return an object 2020-01-13 11:18:24 +00:00
David BakerandGitHub 3105a7c96a Merge pull request #3830 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-01-13 09:43:34 +00:00
catboriseandWeblate b3d3f3b09f Translated using Weblate (Turkish) 
Currently translated at 64.2% (1285 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-13 09:40:10 +00:00
Alexey Murz KorepovandWeblate 0065895b9c Translated using Weblate (Russian) 
Currently translated at 90.0% (1799 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-01-13 09:40:03 +00:00
Slavi PantaleevandWeblate e1cb7b4f08 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-13 09:40:03 +00:00
OsoitzandWeblate 6266f21a08 Translated using Weblate (Basque) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-13 09:40:02 +00:00