937965997d
Merge branch 'origin/develop' into Weblate.
2019-11-08 18:01:37 +00:00
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
2a2a52bd19
Merge branch 'origin/develop' into Weblate.
2019-11-08 17:50:07 +00:00
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
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
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
aac410e1bb
Merge branch 'origin/develop' into Weblate.
2019-11-08 16:58:21 +00:00
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
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
d4fa570bee
Merge branch 'origin/develop' into Weblate.
2019-11-08 16:20:49 +00:00
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
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
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
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
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
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
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
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
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
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
3070ee6d7b
Put back the grouped rule & disable the linting rule instead
2019-11-08 16:10:51 +00:00
4283f9ec74
Split CSS rule to fix descending specificity lint error
2019-11-08 16:01:53 +00:00
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
f0e02f59b4
Appease the linter
2019-11-07 15:12:55 -07:00
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
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
2516d8ee61
fix repeated css class
2019-11-07 20:11:31 +01:00
d83f3632f6
make the linter happy
2019-11-07 20:04:36 +01:00
ddd6713e7e
string has moved in i18n apparently
2019-11-07 20:01:33 +01:00
805c83779a
support bubble tile style for verification tiles
2019-11-07 19:56:21 +01:00
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
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
e8c21a341c
add key verification conclusion tile
2019-11-07 19:54:56 +01:00
0d2f9c4215
add verification request tile + styling
2019-11-07 19:54:56 +01:00
5c9e80a0ba
add feature flag and send verification using DM from dialog if enabled
2019-11-07 19:54:56 +01:00
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
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
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
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
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
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
03c93b5f38
Merge pull request #3595 from N-Pex/linkify-fix
...
Fix linkify imports
2019-11-07 12:28:57 +02:00
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
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
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
a0909df269
v1.7.2
2019-11-06 14:17:09 +00:00
c73b553831
Prepare changelog for v1.7.2
2019-11-06 14:17:09 +00:00
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
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
Weblate