Commit Graph

22088 Commits

Author SHA1 Message Date
Bruno Windels
43f15ab47d
Merge pull request #4008 from BobVul/fix-markdown-escapes
Fix escaped markdown passing backslashes through
2020-02-14 09:18:53 +00:00
Hubert Chathi
908ca6b6ef add test for grouping room creation events 2020-02-13 17:25:54 -05:00
Michael Telatynski
256659e6f8
Merge pull request #4071 from MarcoZehe/MoveSidebarTabs
Move the sidebar to below the sidebar tab buttons for screen readers.
2020-02-13 18:31:25 +00:00
Marco Zehe
7840aa74fd Fix ID to be namespaced
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-13 19:18:21 +01:00
RiotRobot
ab91e859d9 v2.1.0-rc.2 2020-02-13 17:47:20 +00:00
RiotRobot
138ad3b1b1 Prepare changelog for v2.1.0-rc.2 2020-02-13 17:47:19 +00:00
RiotRobot
1970dbff94 Try JS SDK upgrade one more time 2020-02-13 17:43:27 +00:00
RiotRobot
242f1afb55 v2.1.0-rc.1 2020-02-13 17:35:56 +00:00
RiotRobot
32c2d848a4 Prepare changelog for v2.1.0-rc.1 2020-02-13 17:35:56 +00:00
Michael Telatynski
8ea13d9b57 delint prefer let/const over var
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 17:05:48 +00:00
Michael Telatynski
4ed27a4ba6 Move bulk to react-sdk and reference it from riot-web land
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 16:58:27 +00:00
Michael Telatynski
627a4d4ea4 Update comments and such
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 16:53:45 +00:00
Michael Telatynski
12aae12218 Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent 2020-02-13 16:36:05 +00:00
Bruno Windels
3292991491 provide specific label for when accepting/declining is in progress
also distuingish between cancelling and declining
2020-02-13 17:29:38 +01:00
Bruno Windels
3eb07465f7 use canAccept in tile, which takes local echo into account 2020-02-13 17:29:13 +01:00
Bruno Windels
3ec0301f9d use canAccept in toast, which takes local echo into account 2020-02-13 17:28:10 +01:00
RiotRobot
163539d9f4 Upgrade JS SDK to 5.0.0-rc.1 2020-02-13 15:57:48 +00:00
Zoe
786d853f4c
Merge pull request #4067 from matrix-org/foldleft/12191-pull-big-tooltip
don't show tooltips on big icons
2020-02-13 15:22:09 +00:00
Marco Zehe
6319407cab Move the sidebar to below the sidebar tab buttons for screen readers.
Do this by aria-owning the sidebar into the header wrapper. aria-owned subtrees get added as the last child after all other child elements that are in the DOM. This way, if a sidebar tab is activated, the aside element now is inserted in a position following the tabs, before the main messages list. The association for screen readers is therefore more logical. This has no bearing on the DOM order or CSS properties. aria-owns simply rearranges the accessibility tree.

Fixes vector-im/riot-web/issues/11319

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-13 16:02:58 +01:00
J. Ryan Stinnett
e3ec4158f5
Merge pull request #4069 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-02-13 14:33:50 +00:00
Zoe
37f1104f61 lint 2020-02-13 14:15:08 +00:00
Zoe
c3af1a2f95 don't be too magic about hiding tooltips 2020-02-13 13:47:39 +00:00
Bruno Windels
4b7cc12daa check if there is already a request in progress when clicking verify
and go straight there instead of first showing EncryptionInfo panel
2020-02-13 14:34:44 +01:00
Bruno Windels
68197a1d18 also update phase after starting request
as it might now be a request that is already ongoing
2020-02-13 14:33:35 +01:00
Bruno Windels
d49fbf25f7 check if verifier sasEvent was already set on mount
this allow the verification panel to fully recover
the UI state from an on-going verification request
2020-02-13 14:32:33 +01:00
Weblate
ccb88cd422 Merge branch 'origin/develop' into Weblate. 2020-02-13 12:46:38 +00:00
Michael Telatynski
4952b5b001
Merge pull request #4068 from matrix-org/t3chguy/piwik_csp
Fix sending of visit variables to Matomo
2020-02-13 12:46:33 +00:00
Michael Telatynski
f53c415504 Fix sending of visit variables
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 11:50:40 +00:00
Weblate
6ed8a7593e Merge branch 'origin/develop' into Weblate. 2020-02-13 10:59:08 +00:00
Michael Telatynski
12c743b160
Merge pull request #4066 from matrix-org/t3chguy/piwik_csp
Use embedded piwik script rather than piwik.js to respect CSP
2020-02-13 10:59:02 +00:00
Michael Telatynski
0c4ee0091e Update comment and clear up localstorage on disabling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 10:47:50 +00:00
Zoe
9649f2a2da don't show tooltips on big icons
fixes: https://github.com/vector-im/riot-web/issues/12191
2020-02-13 10:11:57 +00:00
Weblate
93c412c584 Merge branch 'origin/develop' into Weblate. 2020-02-13 08:51:44 +00:00
Szimszon
98e8fed26e Translated using Weblate (Hungarian)
Currently translated at 100.0% (2120 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-02-13 08:51:43 +00:00
Bruno Windels
ec708b5e9b
Merge pull request #4058 from matrix-org/bwindels/dontpassmethodstoverify
remove methods arg to requestVerification(DM)
2020-02-13 08:51:36 +00:00
Michael Telatynski
8d445d54ec Use embedded piwik caller rather than piwik.js bcuz CSP :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-13 00:39:28 +00:00
Weblate
d6d0831c16 Merge branch 'origin/develop' into Weblate. 2020-02-12 17:44:44 +00:00
Travis Ralston
d172e1bf85 Revert "Merge pull request #4060 from matrix-org/travis/better-invite"
This reverts commit 48860f0a10.
2020-02-12 10:44:27 -07:00
Weblate
8ce73192cc Merge branch 'origin/develop' into Weblate. 2020-02-12 17:04:32 +00:00
Travis Ralston
b514f89594
Merge pull request #4061 from matrix-org/travis/fix-settings-handling
Check for null config settings a bit safer
2020-02-12 10:04:26 -07:00
Weblate
8943546fd9 Merge branch 'origin/develop' into Weblate. 2020-02-12 17:03:40 +00:00
Travis Ralston
48860f0a10
Merge pull request #4060 from matrix-org/travis/better-invite
Score user ID searches higher when they match nearly exactly
2020-02-12 10:03:33 -07:00
Weblate
b984764268 Merge branch 'origin/develop' into Weblate. 2020-02-12 15:36:09 +00:00
J. Ryan Stinnett
b46af07752
Merge pull request #4051 from TestardR/feature/WhoIsTyping
Fix uncentered letter inside avatar for currently typing users
2020-02-12 15:36:02 +00:00
Weblate
8cabf45ec4 Merge branch 'origin/develop' into Weblate. 2020-02-12 14:10:33 +00:00
Besnik Bleta
13e03bb696 Translated using Weblate (Albanian)
Currently translated at 99.7% (2113 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-02-12 14:10:33 +00:00
Zoe
d1cce3030c
Merge pull request #4065 from matrix-org/foldleft/12335-verification-panel
Disable 'start' button after clicking in VerificationPanel
2020-02-12 14:10:26 +00:00
Zoe
e1608509d0 Disable 'start' button after clicking in VerificationPanel 2020-02-12 13:53:16 +00:00
Weblate
aba11f0a2f Merge branch 'origin/develop' into Weblate. 2020-02-12 11:18:37 +00:00
Zoe
466d4a3e51
Merge pull request #4057 from matrix-org/foldleft/12221-secret-storage
Fixed bug where key reset didn't always return the right key
2020-02-12 11:18:32 +00:00