Michael Telatynski
9a3c30b1f1
Merge pull request #5203 from matrix-org/t3chguy/fix/15150
...
Don't show Notifications Prompt Toast if user has master rule enabled
2020-09-15 14:09:38 +01:00
Michael Telatynski
6b5426bddd
Rename toolbar Notifier methods to prompt
2020-09-15 13:58:29 +01:00
Michael Telatynski
ab91ce4b2d
Merge pull request #5206 from matrix-org/t3chguy/fix/15170
...
Fix Bridges tab crashing when the room does not have bridges
2020-09-14 17:09:46 +01:00
RiotRobot
747126950b
Merge branch 'master' into develop
2020-09-14 16:07:54 +01:00
RiotRobot
4f930ac50c
v3.4.1
2020-09-14 15:49:09 +01:00
RiotRobot
a5d42d1e2a
Prepare changelog for v3.4.1
2020-09-14 15:49:09 +01:00
Michael Telatynski
e32cb175cb
Fix Bridges tab crashing when the room does not have bridges
2020-09-14 15:44:00 +01:00
Michael Telatynski
e261a18183
Merge pull request #5202 from matrix-org/t3chguy/fix/15140
...
Don't count widgets which no longer exist towards pinned count
2020-09-14 15:38:10 +01:00
Michael Telatynski
c6a3b8b783
Merge pull request #5205 from matrix-org/t3chguy/fix/resizeNotifier-optional
...
Fix crashes with cannot read isResizing of undefined
2020-09-14 15:38:02 +01:00
Michael Telatynski
e6e77633ad
Fix crashes with cannot read isResizing of undefined
2020-09-14 15:37:02 +01:00
Michael Telatynski
ca0ad0b7ed
Don't count widgets which no longer exist towards pinned count
2020-09-14 15:36:44 +01:00
Michael Telatynski
fa50b31fd2
Fix crashes with cannot read isResizing of undefined
2020-09-14 15:20:06 +01:00
Michael Telatynski
493d3ae288
Don't show Notifications Prompt Toast if user has master rule enabled
2020-09-14 14:35:08 +01:00
Michael Telatynski
73608c4aa9
Don't count widgets which no longer exist towards pinned count
2020-09-14 14:03:51 +01:00
RiotRobot
148cad6ea2
Reset matrix-js-sdk back to develop branch
2020-09-14 13:42:34 +01:00
RiotRobot
c652ca56da
Merge branch 'master' into develop
2020-09-14 13:41:29 +01:00
RiotRobot
099f50b10e
v3.4.0
2020-09-14 13:36:32 +01:00
RiotRobot
c6eda819f0
Prepare changelog for v3.4.0
2020-09-14 13:36:31 +01:00
RiotRobot
ba73847296
Upgrade matrix-js-sdk to 8.3.0
2020-09-14 13:31:41 +01:00
David Baker
c68a980c59
Merge pull request #5193 from matrix-org/dbkr/remove_jitsi_widget_on_call_button
...
Prompt to remove the jitsi widget when pressing the call button
2020-09-14 09:44:45 +01:00
Travis Ralston
fe0eea84dd
Merge pull request #5196 from matrix-org/travis/e2e-iconography
...
[Release] Show verification status in the room summary card
2020-09-11 10:05:38 -06:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
...
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
Travis Ralston
652c037380
Use hooks better (from develop)
2020-09-11 09:06:17 -06:00
Travis Ralston
8862b8298c
Use hooks better
2020-09-11 09:04:06 -06:00
J. Ryan Stinnett
8f3469237a
Merge pull request #5200 from matrix-org/jryans/userinfo-scroll-release
...
Fix user info scrolling in new card view
2020-09-11 15:48:58 +01:00
J. Ryan Stinnett
acdabe3ca0
Fix user info scrolling in new card view
...
Fixes https://github.com/vector-im/element-web/issues/15148
2020-09-11 15:29:47 +01:00
J. Ryan Stinnett
35e71f4066
Merge pull request #5199 from matrix-org/jryans/stickerpicker-height-release
...
Fix sticker picker height
2020-09-11 15:08:12 +01:00
J. Ryan Stinnett
d53cbecbb1
Merge pull request #5198 from matrix-org/jryans/userinfo-scroll
...
Fix user info scrolling in new card view
2020-09-11 14:52:06 +01:00
David Baker
b633564bea
unused import
2020-09-11 13:02:02 +01:00
David Baker
e54d4e665f
Don't prompt to remove jitsi widget if the user don't have permission
2020-09-11 12:20:32 +01:00
J. Ryan Stinnett
be3a8613ec
Fix sticker picker height
...
Fixes https://github.com/vector-im/element-web/issues/15152
2020-09-11 11:46:25 +01:00
J. Ryan Stinnett
a56a193c2d
Merge pull request #5197 from matrix-org/jryans/stickerpicker-height
...
Fix sticker picker height
2020-09-11 11:45:21 +01:00
J. Ryan Stinnett
e49a657a90
Fix user info scrolling in new card view
...
Fixes https://github.com/vector-im/element-web/issues/15148
2020-09-11 11:39:58 +01:00
J. Ryan Stinnett
cd3aa81eed
Fix sticker picker height
...
Fixes https://github.com/vector-im/element-web/issues/15152
2020-09-11 11:12:56 +01:00
David Baker
de8865d844
Merge pull request #5191 from matrix-org/dbkr/jitsi_call_naming
...
Call jitsi widgets 'group calls'
2020-09-11 10:27:00 +01:00
David Baker
2af803c1bb
remove unused stuff
2020-09-11 10:17:37 +01:00
David Baker
a93afe8c69
Check jitsi type in proper way
2020-09-11 09:57:13 +01:00
David Baker
07693b71b1
Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets
...
Don't show 'unpin' for persistent widgets
2020-09-11 09:53:09 +01:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup
...
Split up cross-signing and secure backup settings
2020-09-11 09:41:40 +01:00
Michael Telatynski
247e1d431d
Merge pull request #5185 from matrix-org/t3chguy/fix/3543
...
Fix onNewScreen to use replace when going from roomId->roomAlias
2020-09-11 07:29:10 +01:00
Travis Ralston
cd360ba92f
Fix for release
2020-09-10 13:59:22 -06:00
Travis Ralston
4cb7381d03
Show verification status in the room summary card
...
Fixes https://github.com/vector-im/element-web/issues/15143
Colours are the same for both light and dark theme.
2020-09-10 13:53:42 -06:00
Travis Ralston
14f6d9e79f
[Release] Show verification status in the room summary card
...
https://github.com/matrix-org/matrix-react-sdk/pull/5195 to release - see https://github.com/matrix-org/matrix-react-sdk/pull/5195 for details.
2020-09-10 13:52:50 -06:00
David Baker
b7058a33ad
lint
2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f
Don't show 'unpin' for persistent widgets
...
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
2020-09-10 14:30:35 +01:00
David Baker
18be4cb202
Use widget type fromString
2020-09-10 14:18:49 +01:00
David Baker
96080f2ccc
Prompt to remove the jitsi widget when pressing the call button
...
If there's already one in the room.
We threw up an error message anyway telling you there was already
a jitsi widget, so just add a button to end the call.
2020-09-10 14:06:13 +01:00
Matthew Hodgson
017765df24
Merge pull request #5192 from matrix-org/matthew/badge-counts
...
bring back 1.2M style badge counts rather than 99+
2020-09-10 13:58:07 +01:00
Matthew Hodgson
5ecc3f4398
kill formatMinimalBadgeCount entirely
2020-09-10 13:56:46 +01:00
Matthew Hodgson
89d05ac952
bring back 1.2M style badge counts rather than 99+
2020-09-10 13:51:34 +01:00
