Commit Graph

38704 Commits (bc9395457782a18de029b2d097f30675a832be78)

Author SHA1 Message Date
Michael Telatynski 8ee6a08639 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19304 2021-10-07 11:19:12 +01:00
Michael Telatynski 1c8bcce0ed comment 2021-10-07 11:13:13 +01:00
Michael Telatynski 047f182cd8 focusLock only specific context menus 2021-10-07 11:04:10 +01:00
Germain Souquet c009d15176 Allow the header container to collapse on itself when room list not minimised 2021-10-07 10:57:23 +01:00
Travis Ralston 0f212b2607
Merge pull request #6912 from matrix-org/hs/ignore-greater-pl-scalar
Scalar messaging: No-op setBotPower if the current PL is greater than the requested PL.
2021-10-06 10:19:14 -06:00
Michael Telatynski ab98549fff move the logic to the parent so that the section hiding works 2021-10-06 17:08:32 +01:00
Will Hunt 88410a1b29 Make function async 2021-10-06 17:00:54 +01:00
Michael Telatynski 9ea30a3af4
Merge pull request #6908 from matrix-org/t3chguy/fix/19276 2021-10-06 16:59:33 +01:00
Michael Telatynski 4ac29a431c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19276 2021-10-06 16:53:39 +01:00
Michael Telatynski 54815461fa
Merge pull request #6910 from matrix-org/t3chguy/cp/space-hierarchy 2021-10-06 16:51:35 +01:00
Michael Telatynski b373b98d48 Simplify aria menu item roles/selectors 2021-10-06 16:49:53 +01:00
Will Hunt 3f6f2bcbb3 no-op a setBotPower request from the integration manager when the PL is equal to or greater to the requested PL
When configured
2021-10-06 16:48:17 +01:00
Michael Telatynski a6c780674a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/focus-lock-ctx-menu
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-10-06 16:39:52 +01:00
Michael Telatynski 52d0b0133c Hide kick & ban options in UserInfo when looking at own profile 2021-10-06 14:46:39 +01:00
Michael Telatynski a0c0eea4fd Simplify and improve useRoomHierarchy hook 2021-10-06 13:29:27 +01:00
Michael Telatynski a51847e50a
Merge pull request #6909 from matrix-org/t3chguy/fix/19255 2021-10-06 13:25:03 +01:00
Michael Telatynski d8bc868e79 Fix spaces keyboard shortcuts not working for last space 2021-10-06 10:56:11 +01:00
Michael Telatynski 79f3348986 Simplify and improve useRoomHierarchy hook 2021-10-06 10:27:16 +01:00
Michael Telatynski cadc9d2990 Improve emoji shortcodes generated from annotations 2021-10-06 09:47:56 +01:00
Michael Telatynski fa800796c7 Respect tombstones in locally known rooms for Space children 2021-10-06 09:41:57 +01:00
Michael Telatynski 1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216 2021-10-06 09:29:25 +01:00
Andrew Ferrazzutti 413d6e1eb0 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2021-10-05 11:27:48 -04:00
Andy Balaam 48b38b287a
Merge pull request #6895 from andybalaam/simon-auto-avatars
Use fallback avatar only for DMs with 2 people
2021-10-05 15:49:27 +01:00
Faye Duxovni 418043488b
Merge pull request #6811 from matrix-org/fayed/fix-verification-dialog
Make cross-signing dialog clearer and more context-aware
2021-10-05 09:06:33 -04:00
Faye Duxovni 651e943b31 Merge branch 'develop' into fayed/fix-verification-dialog 2021-10-05 08:48:52 -04:00
Faye Duxovni 9a16b4636f Make cross-signing dialog clearer and more context-aware
- Don't show loading spinners while waiting for user action
- When checking if there are other devices we can verify against, only
  look for devices that are actually cross-signed.
- Adjust displayed options depending on whether other devices and/or
  recovery keys exist, and add an option to reset cross-signing keys
  if necessary.
- Various minor clarifying adjustments to UI styling/text

Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-05 00:54:20 -04:00
Germain Souquet c670d95e27 Update dependencies 2021-10-04 12:30:26 +01:00
RiotRobot 425eeada6f v3.32.0-rc.1 2021-10-04 12:03:41 +01:00
RiotRobot c0258187a2 Prepare changelog for v3.32.0-rc.1 2021-10-04 12:03:40 +01:00
RiotRobot 7fc4f54ae7 Upgrade matrix-js-sdk to 14.0.0-rc.1 2021-10-04 12:01:31 +01:00
Germain 49fce9784a
Merge pull request #6902 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-10-04 11:46:36 +01:00
Weblate acde10fb97 Merge branch 'origin/develop' into Weblate. 2021-10-04 10:43:52 +00:00
Germain b45cd4f59a
Merge pull request #6901 from AndrewFerr/guest_register_toggle 2021-10-04 11:43:48 +01:00
Weblate 60f7137765 Merge branch 'origin/develop' into Weblate. 2021-10-04 10:42:48 +00:00
Ihor Hordiichuk 27cd1f73bc Translated using Weblate (Ukrainian)
Currently translated at 66.7% (2134 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2021-10-04 10:42:47 +00:00
Nikita Epifanov dbd3829d3f Translated using Weblate (Russian)
Currently translated at 98.2% (3141 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2021-10-04 10:42:42 +00:00
jelv 287f4ae2f2 Translated using Weblate (Dutch)
Currently translated at 100.0% (3198 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-10-04 10:42:33 +00:00
iaiz 2d02bb691b Translated using Weblate (Spanish)
Currently translated at 99.5% (3183 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-10-04 10:42:25 +00:00
Germain 0afbc192fc
Merge pull request #6900 from ColonisationCaptain/patch-1 2021-10-04 11:42:13 +01:00
Andy Balaam e8dba59b42 Fix review comments from Šimon Brandner.
Rename test->it; Rename users->userIds; Un-break a line.
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-04 11:41:09 +01:00
ColonisationCaptain a076bee764 Decrease profile button touch target 2021-10-03 19:51:46 +01:00
Andrew Ferrazzutti 65e67003f3 Allow hiding "Sign Up" in the guest preview bar
Hide the button when "UIFeature.registration" is set to false in
Element's config.json.

Fixes https://github.com/vector-im/element-web/issues/19264

Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-10-03 14:10:09 -04:00
jelv 51eac4ed96 Translated using Weblate (Dutch)
Currently translated at 98.9% (3166 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-10-03 07:25:35 +00:00
Andrew Ferrazzutti 073c5307f8 Close modal after re-attempt of room creation, not before
Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-10-03 02:33:25 -04:00
Šimon Brandner aeb74471a2
Move backports
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 21:20:40 +02:00
Šimon Brandner 14466b1e3b
$settings-profile-placeholder-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:43:46 +02:00
Šimon Brandner 8a9c493f3a
Use correct color for a selected room in the
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:40:18 +02:00
Šimon Brandner 47fcd59301
Remove $eventtile-meta-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:37:53 +02:00
Weblate f0e68e1b0d Merge branch 'origin/develop' into Weblate. 2021-10-01 14:57:11 +00:00
Germain 9f26c1ca57
Merge pull request #6888 from matrix-org/gsouquet/fix-19229 2021-10-01 15:57:06 +01:00