Commit graph

20340 commits

Author SHA1 Message Date
Weblate
2f257c2dc7 Merge branch 'origin/develop' into Weblate. 2020-01-06 05:18:26 +00:00
Travis Ralston
4ab7b9ba92
Merge pull request #3809 from aaronraimist/pinned-msg-display-name
Use display name when pinned messages are changed
2020-01-05 22:18:21 -07:00
Aaron Raimist
98ede6437e Use display name when pinned messages are changed
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-01-05 23:04:46 -06:00
Michael Telatynski
c802f9a302 remove unused stale Test Suite
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:23:19 +00:00
Michael Telatynski
64754a3f88 Add comment and delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:18:24 +00:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:15:48 +00:00
Weblate
58271e840c Merge branch 'origin/develop' into Weblate. 2020-01-06 00:08:43 +00:00
Travis Ralston
92fb6fcdc2
Merge pull request #3790 from justin-sleep/fix-dark-diff-highlighting
Fix inverted diff line highlighting in dark theme
2020-01-05 17:08:38 -07:00
Weblate
0cad813071 Merge branch 'origin/develop' into Weblate. 2020-01-06 00:03:22 +00:00
Travis Ralston
781b69f4e3
Merge pull request #3693 from matrix-org/hs/bridge-info
Bridge info settings tab
2020-01-05 17:03:15 -07:00
Justin Sleep
8ec8a7c015 Comment rationale for swapping dark theme colors
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
2020-01-05 17:58:07 -06:00
Justin Sleep
dcdf68d7e1 Explicitly define diff colors in light theme
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
2020-01-05 17:35:39 -06:00
Will Hunt
7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Michael Telatynski
4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description
 Conflicts:
	package.json
2020-01-05 22:23:03 +00:00
Michael Telatynski
378a82e6fb Use html-entities instead
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 22:22:09 +00:00
Michael Telatynski
4a836349ab regenerate i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 22:01:59 +00:00
Michael Telatynski
b6098ddb47 Delegate all room alias validation to the RoomAliasField validator
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 21:58:36 +00:00
Weblate
95cc08e5d7 Merge branch 'origin/develop' into Weblate. 2020-01-05 21:46:48 +00:00
catborise
a231419a77 Translated using Weblate (Turkish)
Currently translated at 53.2% (1067 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-05 21:46:48 +00:00
Szimszon
8128b97f35 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-05 21:46:45 +00:00
Kévin C
d1405233bd Translated using Weblate (French)
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-05 21:46:45 +00:00
Samu Voutilainen
e6c8016086 Translated using Weblate (Finnish)
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-01-05 21:46:44 +00:00
Jeff Huang
b8f1ca679b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-05 21:46:44 +00:00
Besnik Bleta
c2c4426396 Translated using Weblate (Albanian)
Currently translated at 99.1% (1988 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-05 21:46:43 +00:00
Michael Telatynski
449efec1a1
Merge pull request #3805 from matrix-org/t3chguy/rageshake_enabled_labs
Send the labs flags the client is running with in rageshake
2020-01-05 21:46:32 +00:00
Michael Telatynski
ba2f4aa973 tidy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 21:26:32 +00:00
Michael Telatynski
cf071c5ac6 Deduplicate recent emoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 21:23:34 +00:00
Michael Telatynski
814c0aa4c2 Send enabled_labs over rageshake as comma delimited list
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 20:52:54 +00:00
Will Hunt
2ccc8caa69
Fix indent 2020-01-05 15:50:06 +00:00
Michael Telatynski
295dcbfe48 Fix ability to remove avatars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-04 13:34:05 +00:00
Travis Ralston
8b4c1e3dec Support searching in the user directory for invite targets
Part of https://github.com/vector-im/riot-web/issues/11200
2020-01-03 21:22:06 -07:00
Travis Ralston
df25a98810 Implement basic filtering for invite targets
Part of https://github.com/vector-im/riot-web/issues/11200
2020-01-03 21:22:06 -07:00
Travis Ralston
250222726d Merge branch 'travis/ftue/user-lists/2-suggestions' into travis/ftue/user-lists/3-filtering 2020-01-03 20:34:00 -07:00
Travis Ralston
31d5617c97 Add suggestions for which users to invite to chat
Fixes https://github.com/vector-im/riot-web/issues/11198

Note this doesn't implement the entire algorithm in 11198 because it feels too complicated at this stage. Instead, the idea is to review the suggestions closer to when the whole dialog is complete and fix them then: https://github.com/vector-im/riot-web/issues/11769

Algorithm for picking members is largely based on db5218e19a
2020-01-03 19:41:06 -07:00
Weblate
6aab061fb9 Merge branch 'origin/develop' into Weblate. 2020-01-03 17:32:30 +00:00
Travis Ralston
65954b1e1b
Merge pull request #3792 from matrix-org/travis/ftue/user-lists/1-initial
Initial implementation of FTUE user lists design
2020-01-03 10:32:24 -07:00
Travis Ralston
752482964a Purify the components 2020-01-03 10:24:07 -07:00
Weblate
b97736f058 Merge branch 'origin/develop' into Weblate. 2020-01-03 16:32:09 +00:00
J. Ryan Stinnett
76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s
Update key backup creation and recovery paths for SSSS
2020-01-03 16:32:02 +00:00
Weblate
21fb15d76a Merge branch 'origin/develop' into Weblate. 2020-01-03 16:04:07 +00:00
David Baker
9bf5449f33
Merge pull request #3798 from matrix-org/dbkr/dont_fail_if_logs_empty
Don't fail if logs exists and is an empty dir
2020-01-03 16:04:02 +00:00
Weblate
5096696f4b Merge branch 'origin/develop' into Weblate. 2020-01-03 16:04:01 +00:00
Slavi Pantaleev
33d35c83ba 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-03 16:04:01 +00:00
David Baker
e9fa6032af
Merge pull request #3799 from matrix-org/dbkr/comment_remaining_non_cross_signing_components
Comment remaining non-cross-signing-compliant components
2020-01-03 16:03:53 +00:00
J. Ryan Stinnett
e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
David Baker
2125bcf5a6 Comment remaining non-cross-signing-compliant components
Fixes https://github.com/vector-im/riot-web/issues/11748
2020-01-03 15:38:59 +00:00
J. Ryan Stinnett
b8683462e8 Update backup creation paths for SSSS
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
2020-01-03 15:34:05 +00:00
Weblate
b79e1d47c4 Merge branch 'origin/develop' into Weblate. 2020-01-03 15:24:03 +00:00
Slavi Pantaleev
731279ab2d Translated using Weblate (Bulgarian)
Currently translated at 99.2% (1985 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-03 15:24:03 +00:00
David Baker
f9216ea590
Merge pull request #3797 from matrix-org/dbkr/remove_unverify
Remove 'unverify' from UserInfoPanel
2020-01-03 15:23:52 +00:00