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
Weblate
ce3c8db1d6
Merge branch 'origin/develop' into Weblate.
2020-09-29 16:18:34 +00: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
Weblate
67a209f2b8
Merge branch 'origin/develop' into Weblate.
2020-09-29 16:07:53 +00: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
Weblate
7a8bb09a07
Merge branch 'origin/develop' into Weblate.
2020-09-29 16:07:20 +00: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
123dada465
Remove width limit on widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:49:02 +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
Michael Telatynski
0f10ffa3c5
fix sequence sorting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 11:09:17 +01:00
Michael Telatynski
48d9aa2c3e
MELS use latest avatar rather than the first avatar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:53:04 +01:00
Michael Telatynski
8a9d38b702
convert MemberEventListSummary and ELS to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:51:48 +01:00
Michael Telatynski
c4ee8e4a6c
Fix Encryption Panel close button clashing with Base Card
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:11:04 +01:00
Michael Telatynski
f945155d04
Convert UserInfo to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:10:32 +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
Weblate
eaa73f5907
Merge branch 'origin/develop' into Weblate.
2020-09-29 03:02:13 +00: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
Weblate
8b7e60f6e3
Merge branch 'origin/develop' into Weblate.
2020-09-28 16:04:09 +00: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
Weblate
dcbe31dc42
Merge branch 'origin/develop' into Weblate.
2020-09-28 15:47:14 +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
Weblate
e268c4e48e
Merge branch 'origin/develop' into Weblate.
2020-09-28 15:20:17 +00:00
RiotRobot
524b2dbd22
Reset matrix-js-sdk back to develop branch
2020-09-28 16:20:07 +01:00
Weblate
b5a880cdf1
Merge branch 'origin/develop' into Weblate.
2020-09-28 15:19:32 +00: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
Michael Telatynski
abd7bf37f4
Choose first result on enter in the emoji picker
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 15:56:22 +01:00
Michael Telatynski
6873402666
Convert emojipicker to typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 15:48: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
Weblate
a904577b90
Merge branch 'origin/develop' into Weblate.
2020-09-27 23:27:00 +00: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
Weblate
17656e7ba5
Merge branch 'origin/develop' into Weblate.
2020-09-27 22:36:46 +00: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