Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-12-02 09:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,243 Commits 218 Branches 561 Tags 457 MiB
154fb7ecac
Commit Graph

19243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
af396fdf60
Merge pull request #3607 from matrix-org/travis/fix-replies 
Fix HTML fallback in replies
 2019-11-08 16:15:38 -07:00
Travis Ralston
bdcf3890a5 Fix HTML fallback in replies 
Correctly encode the `body` to avoid problems down the line. We also convert newlines to `<br/>` to better represent the message as a fallback.

Fixes https://github.com/vector-im/riot-web/issues/9413
 2019-11-08 16:07:11 -07:00
Travis Ralston
c4d45e87ea Use a ternary operator instead of relying on AND semantics in EditHIstoryDialog 
Fixes https://github.com/vector-im/riot-web/issues/11334 (probably).

`allEvents` should never have a boolean in it, so given the stack trace and the code this is my best estimate for what the problem could be. I can't reproduce the problem.
 2019-11-08 15:54:48 -07:00
Weblate
937965997d Merge branch 'origin/develop' into Weblate. 2019-11-08 18:01:37 +00:00
J. Ryan Stinnett
719709250b
Merge pull request #3605 from matrix-org/jryans/rounded-style-bar 
Fix rounded corners for the formatting toolbar
 2019-11-08 20:01:31 +02:00
Weblate
2a2a52bd19 Merge branch 'origin/develop' into Weblate. 2019-11-08 17:50:07 +00:00
Travis Ralston
de59979f79
Merge pull request #3604 from matrix-org/travis/fix-crashes 
Check for a message type before assuming it is a room message
 2019-11-08 10:50:00 -07:00
J. Ryan Stinnett
e161e99b63 Fix rounded corners for the formatting toolbar 
The formatting toolbar is meant to have rounded corners like the message action
bar.

Fixes https://github.com/vector-im/riot-web/issues/11203
 2019-11-08 17:46:08 +00:00
Travis Ralston
5a5ebee918 Check for a message type before assuming it is a room message 
Redacted messages do not have message types, despite being room messages. 

Fixes https://github.com/vector-im/riot-web/issues/11352

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3601

Click-to-ping being broken (as mentioned by https://github.com/vector-im/riot-web/issues/11353) is a side effect of the react stack falling over. Once one room crashes, click-to-ping is broken everywhere.
 2019-11-08 10:39:38 -07:00
Weblate
aac410e1bb Merge branch 'origin/develop' into Weblate. 2019-11-08 16:58:21 +00:00
J. Ryan Stinnett
eff4c36e6e
Merge pull request #3603 from matrix-org/jryans/remove-descend-hints 
Remove lint comments about no-descending-specificity
 2019-11-08 18:58:14 +02:00
J. Ryan Stinnett
2a5dc9bfac Remove lint comments about no-descending-specificity 
We have disabled the `no-descending-specificity` stylelint rule, so we no longer
need these block comments.
 2019-11-08 16:35:42 +00:00
Weblate
d4fa570bee Merge branch 'origin/develop' into Weblate. 2019-11-08 16:20:49 +00:00
Walter
4fe95b0075 Translated using Weblate (Russian) 
Currently translated at 99.8% (1849 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-11-08 16:20:48 +00:00
fenuks
bb5f532eeb Translated using Weblate (Polish) 
Currently translated at 74.6% (1382 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-11-08 16:20:47 +00:00
MamasLT
824a265496 Translated using Weblate (Lithuanian) 
Currently translated at 50.4% (933 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2019-11-08 16:20:46 +00:00
송태섭
defe3fb5f8 Translated using Weblate (Korean) 
Currently translated at 100.0% (1853 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-11-08 16:20:29 +00:00
shuji narazaki
8b3844f83b Translated using Weblate (Japanese) 
Currently translated at 60.8% (1126 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2019-11-08 16:20:28 +00:00
Szimszon
84d23676d6 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1853 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-08 16:20:23 +00:00
dreamerchris
4eb39190b4 Translated using Weblate (Greek) 
Currently translated at 39.7% (735 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
 2019-11-08 16:20:23 +00:00
Kévin C
6d4971c29e Translated using Weblate (French) 
Currently translated at 100.0% (1853 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-11-08 16:20:15 +00:00
Jeff Huang
dc5abbe380 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1853 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-11-08 16:20:15 +00:00
Slavi Pantaleev
06ab9efed6 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1853 of 1853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-11-08 16:20:14 +00:00
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
Travis Ralston
86be607e92 onTileUpdate -> onMessageAllowed 
We keep onTileUpdate in MessgeEvent because it's a generic thing for the class to handle. onMessageAllowed is slightly different than onShowAllowed because "show allowed" doesn't quite make sense on its own, imo.
 2019-11-06 10:52:00 -07:00
RiotRobot
a0909df269 v1.7.2 2019-11-06 14:17:09 +00:00