Travis Ralston
14766e24b8
Merge branch 'develop' into travis/widget-api
2020-09-29 13:18:18 -06:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup
...
Make the hangup button do things for conference calls
2020-09-29 11:06:21 -06:00
Travis Ralston
36882b85d7
Merge pull request #5222 from matrix-org/travis/ft-sep1620/03-jitsi-obvious
...
Render Jitsi widget state events in a more obvious way
2020-09-29 11:05:40 -06:00
Travis Ralston
bfa269a848
Update copy
2020-09-29 10:20:54 -06:00
Travis Ralston
a5569303d1
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip
...
Make the PIP Jitsi look and feel like the 1:1 PIP
2020-09-29 10:18:30 -06:00
Michael Telatynski
e51136f902
Merge pull request #5263 from matrix-org/t3chguy/fix/15310
...
Trim range when formatting so that it excludes leading/trailing spaces
2020-09-29 17:07:49 +01:00
Michael Telatynski
442f25ca4b
Merge pull request #5264 from matrix-org/t3chguy/fix/4303
...
Fix button label on the Set Password Dialog
2020-09-29 17:07:14 +01:00
Michael Telatynski
76a9803c6c
Fix button label on the Set Password Dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:24:01 +01:00
Michael Telatynski
af4c95e267
apply to whitespace in general
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:17:44 +01:00
Michael Telatynski
ffa7ceb70e
Trim range when formatting so that it excludes leading/trailing spaces
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:15:20 +01:00
Travis Ralston
78a04a6106
Remove unused prop
2020-09-28 21:23:55 -06:00
Travis Ralston
6b2e34dc00
Fix export
2020-09-28 21:14:50 -06:00
Travis Ralston
3e8d7b172f
Merge branch 'develop' into travis/widget-api
2020-09-28 21:08:08 -06:00
Travis Ralston
7fa1214cf1
Merge pull request #5259 from orangecms/fix-yarn-link-link
...
fix link to classic yarn's `yarn link`
2020-09-28 21:02:08 -06:00
Daniel Maslowski
bc0c30f99f
fix link to classic yarn's yarn link
...
Signed-off-by: Daniel Maslowski <info@orangecms.org>
2020-09-29 04:46:59 +02:00
Travis Ralston
a20d2af102
Incorporate changes into new call handler
2020-09-28 13:53:44 -06:00
Travis Ralston
9df175212e
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5
Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious
2020-09-28 13:41:48 -06:00
Travis Ralston
4ea3376abf
WIP on AppTile2 transformation
2020-09-28 13:34:13 -06:00
Bruno Windels
8bf4ef5766
Merge pull request #5256 from matrix-org/bwindels/custom-themes-username-colors-idx-mismatch
...
Fix index mismatch between username colors styles and custom theming
2020-09-28 16:04:05 +00:00
Michael Telatynski
84db2baf0f
Merge pull request #5258 from matrix-org/t3chguy/fix/15305
...
Disable autocompletion on security key input during login
2020-09-28 16:47:09 +01:00
Michael Telatynski
330337c993
Disable autocompletion on security key input during login
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 16:25:23 +01:00
RiotRobot
524b2dbd22
Reset matrix-js-sdk back to develop branch
2020-09-28 16:20:07 +01:00
RiotRobot
46e8f53cff
Merge branch 'master' into develop
2020-09-28 16:19:21 +01:00
RiotRobot
ceb2975c91
v3.5.0
2020-09-28 16:18:15 +01:00
RiotRobot
25cd8c61f8
Prepare changelog for v3.5.0
2020-09-28 16:18:14 +01:00
RiotRobot
a16ca8226c
Upgrade matrix-js-sdk to 8.4.1
2020-09-28 16:12:05 +01:00
Bruno Windels
603415c2ec
fix index mismatch
2020-09-28 16:20:16 +02:00
RiotRobot
fe5e1f4543
Upgrade matrix-js-sdk to 8.4.0
2020-09-28 14:25:51 +01:00
Matthew Hodgson
559414f97d
Merge pull request #5255 from matrix-org/matthew/fix-room-upgrade-warning-bar
...
fix uninitialised state and eventlistener leak in RoomUpgradeWarningBar
2020-09-28 00:26:56 +01:00
Michael Telatynski
4273de31ca
Merge pull request #5254 from resynth1943/only-refresh-title-if-needed
...
Only set title when it changes
2020-09-27 23:36:41 +01:00
Matthew Hodgson
45e5903226
fix uninitialised state and eventlistener leak
2020-09-27 21:48:36 +01:00
resynth1943
b499fd06fc
Formatting change
2020-09-27 21:20:41 +01:00
resynth1943
747f9fba38
Only set title when it changes
...
I've seen Chromium constantly refresh the title in the developer tools.
To be honest, I'm not sure if this means Chromium wastes CPU
time changing a title, but this may introduce better performance.
Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-09-27 21:14:43 +01:00
Travis Ralston
96fa34eecf
Add stop functions
2020-09-26 18:40:26 -06:00
Travis Ralston
cb06b8daf6
Merge branch 'develop' into travis/widget-api
2020-09-25 09:39:35 -06:00
Travis Ralston
634ffb0140
Add structure for widget messaging layer
2020-09-25 09:39:21 -06:00
David Baker
585c7637d6
Merge pull request #5248 from matrix-org/dbkr/callhandler_to_ts
...
Convert CallHandler to typescript
2020-09-25 15:52:21 +01:00
David Baker
eb0a4a5fb9
type the action payload
2020-09-24 18:30:30 +01:00
David Baker
10338798d9
map-ify audioPromises
2020-09-24 18:28:46 +01:00
David Baker
4269c26e76
map-ify calls map
2020-09-24 18:18:26 +01:00
Travis Ralston
2a493a155f
Merge branch 'develop' into travis/widget-api
2020-09-24 11:07:12 -06:00
Michael Telatynski
fe67ebf1fd
Merge pull request #5209 from matrix-org/t3chguy/fix/12591
...
Retry loading i18n language if it fails
2020-09-24 17:03:25 +01:00
David Baker
adc93ca7d6
add ts-ignore for js-sdk as per comment
2020-09-24 16:42:59 +01:00
David Baker
00edfc83cd
Add comment for what a mediasession is
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-24 16:38:13 +01:00
David Baker
80f47f0378
i18n
2020-09-24 16:20:32 +01:00
David Baker
8962f7ae9e
Convert CallHandler to typescript
...
and remove the old conference call stuff while we're at it: enough
time should have passed since those mistakes that we can move on.
The old conference call rooms will still appear for anyone whose
account dates back to that time, but they've presumably been appearing
in any other matrix client they used too.
2020-09-24 16:16:20 +01:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120
...
Rework profile area for user and room settings to be more clear
2020-09-24 08:39:01 -06:00
Travis Ralston
a2860e698a
Clean up other unlinted lint issues
2020-09-24 08:26:59 -06:00