Commit graph

19209 commits

Author SHA1 Message Date
David Baker
43c6298bea
Merge pull request #3601 from matrix-org/bwindels/verification-over-dm
Show verification requests in the timeline
2019-11-08 16:20:01 +00:00
David Baker
3070ee6d7b Put back the grouped rule & disable the linting rule instead 2019-11-08 16:10:51 +00:00
David Baker
4283f9ec74 Split CSS rule to fix descending specificity lint error 2019-11-08 16:01:53 +00:00
Travis Ralston
59dccb86ba
Merge pull request #3602 from matrix-org/travis/fix-identity-register
Match identity server registration to the IS r0.3.0 spec
2019-11-08 08:08:47 -07:00
Travis Ralston
f0e02f59b4 Appease the linter 2019-11-07 15:12:55 -07:00
Travis Ralston
cf80cb559e Match identity server registration to the IS r0.3.0 spec
The returned field is `token` for the spec, but we somehow got through with `access_token` on Sydent.
2019-11-07 15:09:23 -07:00
J. Ryan Stinnett
3645e4a822
Merge pull request #3600 from matrix-org/jryans/thumb-variation-again
Restore thumbs after variation selector removal
2019-11-07 22:47:15 +02:00
Bruno Windels
2516d8ee61 fix repeated css class 2019-11-07 20:11:31 +01:00
Bruno Windels
d83f3632f6 make the linter happy 2019-11-07 20:04:36 +01:00
Bruno Windels
ddd6713e7e string has moved in i18n apparently 2019-11-07 20:01:33 +01:00
Bruno Windels
805c83779a support bubble tile style for verification tiles 2019-11-07 19:56:21 +01:00
Bruno Windels
d7f5252f9a render done and cancel event as conclusion tile
don't render any done events not sent by us, as
done events are sent by both parties and we don't want
to render two conclusion tiles.

cancel events should be only sent by one party.
2019-11-07 19:55:18 +01:00
Bruno Windels
9d67fa9fa1 render verification request with correct tile
only if the request was send by or to us, otherwise ignore.
2019-11-07 19:55:18 +01:00
Bruno Windels
e8c21a341c add key verification conclusion tile 2019-11-07 19:54:56 +01:00
Bruno Windels
0d2f9c4215 add verification request tile + styling 2019-11-07 19:54:56 +01:00
Bruno Windels
5c9e80a0ba add feature flag and send verification using DM from dialog if enabled 2019-11-07 19:54:56 +01:00
Bruno Windels
9c4470e599 helper class to track the state of the verification
as we will have 2 tiles, and both need to track
the status of the verification request, I've put
the logic for tracking the state in this helper class
to use from both tiles.
2019-11-07 19:54:56 +01:00
J. Ryan Stinnett
3d1a1121b9 Restore thumbs after variation selector removal
This more thorough change adjusts emoji processing to deal with variation
selectors appropriately and revives the missing thumbs.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3598
Fixes https://github.com/vector-im/riot-web/issues/11344
2019-11-07 17:49:25 +00:00
Michael Telatynski
e864a20cd8
Merge pull request #3599 from MarcoZehe/fix-breadcrumb-a11y
Fix breadcrumbs so the bar is a toolbar and the buttons are buttons.
2019-11-07 17:03:26 +00:00
Marco Zehe
ec2f3d36ea Fix breadcrumbs so the bar is a toolbar and the buttons are buttons.
Signed-off-by: Marco Zehe <marco.zehe@gmail.com>
2019-11-07 14:41:01 +01:00
Michael Telatynski
9d180be3c0
Merge pull request #3597 from matrix-org/t3chguy/fix_room_list_collapsed_padding
Now that part of spacing is padding, make it smaller when collapsed
2019-11-07 10:36:26 +00:00
J. Ryan Stinnett
6cd2b55c23
Merge pull request #3598 from matrix-org/jryans/rm-variation-sels
Remove variation selectors from quick reactions
2019-11-07 12:34:11 +02:00
J. Ryan Stinnett
03c93b5f38
Merge pull request #3595 from N-Pex/linkify-fix
Fix linkify imports
2019-11-07 12:28:57 +02:00
J. Ryan Stinnett
91f3b75d41 Remove variation selectors from quick reactions
This fixes a regression introduced by the full emoji picker which inserted empty
variation selectors in the thumbs up / down quick reactions. Since this makes
them different characters, it would cause us to not aggregate thumbs from web
vs. mobile together.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3554
Fixes https://github.com/vector-im/riot-web/issues/11335
2019-11-07 10:19:35 +00:00
Michael Telatynski
c00974d22d Now that part of spacing is padding, make it smaller when collapsed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-07 10:16:57 +00:00
RiotRobot
a0909df269 v1.7.2 2019-11-06 14:17:09 +00:00
RiotRobot
c73b553831 Prepare changelog for v1.7.2 2019-11-06 14:17:09 +00:00
David Baker
e2acc90fbf
Merge pull request #3596 from matrix-org/dbkr/fix_editing_softcrash
Fix softcrash if editing silly events
2019-11-06 11:53:18 +00:00
David Baker
0464b094a6 Fix softcrash if editing silly events
If you sent an event with a body of the empty json object, riot
would then softcrash when you pressed the up arrow because it
would try to treat a json object as a string and run split on it.
2019-11-06 11:44:32 +00:00
David Baker
d14c0c342d
Merge pull request #3594 from matrix-org/bwindels/fixfilenotifpanel
Fix: file and notifications panel back-paginating forever.
2019-11-06 10:52:15 +00:00
David Baker
68a3fabada
Merge pull request #3591 from matrix-org/t3chguy/a11y_fix
Fix focus-within on EventTile and more showing onClick
2019-11-06 10:50:42 +00:00
David Baker
328fc5a02d fix style lint 2019-11-06 10:41:10 +00:00
N-Pex
d403ed7513 Fix linkify imports
VECTOR_URL_PATTERN was 'undefined' inside Permalinks.tryTransformPermalinkToLocalHref()
2019-11-06 10:41:14 +01:00
Bruno Windels
842bf77409 prevent error when nextProps is null, cleanup
As the FilePanel is now rendered as part of the RoomView,
we don't need to respond to room changes, as RoomView has
a key of the roomId, so the whole subtree would be recreated.
2019-11-06 10:34:22 +01:00
Bruno Windels
9fa7990996 prevent error for empty list 2019-11-06 10:34:22 +01:00
Bruno Windels
eb4220a836 scroll panels should be in flex container so they don't grow w/ content 2019-11-06 10:34:22 +01:00
Travis Ralston
0926ff774a
Merge pull request #3592 from sha-265/patch-1
Support RTL language in message composer
2019-11-05 09:09:31 -07:00
Michael Telatynski
888da3ad84 delint stylesheet 2019-11-05 12:01:30 +00:00
Michael Telatynski
1351f04268 Merge branches 'develop' and 't3chguy/a11y_fix' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/a11y_fix 2019-11-05 11:53:26 +00:00
sha-265
bc924bbd82
Support RTL language in message composer 2019-11-04 17:37:36 +00:00
Michael Telatynski
99c8a909b3 Fix focus-within on EventTile and more showing onClick 2019-11-04 16:47:20 +00:00
RiotRobot
b81c084cf5 Merge branch 'master' into develop 2019-11-04 15:13:47 +00:00
RiotRobot
2f4f15d26c v1.7.1 2019-11-04 15:12:54 +00:00
RiotRobot
4454be9092 Prepare changelog for v1.7.1 2019-11-04 15:12:54 +00:00
RiotRobot
aba557f023 Released react-sdk 2019-11-04 15:09:19 +00:00
David Baker
6b9c8780a8
Merge pull request #3590 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-11-04 12:13:38 +00:00
David Baker
2a1f26a44f Translated using Weblate (Bulgarian)
Currently translated at 97.6% (1808 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-11-04 11:54:55 +00:00
Weblate
f5ceb36a96 Merge branch 'origin/develop' into Weblate. 2019-11-04 10:33:22 +00:00
Michael Telatynski
92ee50fb77
Merge pull request #3587 from matrix-org/t3chguy/a11y_message_actions_bar
Improve A11Y of timeline. Show timestamp & Actions on focus-within
2019-11-04 10:33:16 +00:00
Michael Telatynski
6d3b563119 Add comments regarding tab-index=-1 2019-11-04 10:16:16 +00:00