Commit Graph

36638 Commits (f68309f9966d6335fe5bf96c63898e194bf21ada)

Author SHA1 Message Date
J. Ryan Stinnett f68309f996
Merge pull request #6630 from SimonBrandner/fix/filepanel-e2e-pagination/18415
Fix FilePanel pagination in E2EE rooms
2021-08-18 14:28:02 +01:00
J. Ryan Stinnett fabeb28444
Merge pull request #6631 from matrix-org/jryans/rename-netlify
Fix name of Netlify workflow
2021-08-18 14:27:16 +01:00
J. Ryan Stinnett d836ed5291 Fix name of Netlify workflow 2021-08-18 14:19:44 +01:00
Dariusz Niemczyk 1066bef1b0
Merge pull request #6625 from matrix-org/palid/fix/media-isEncrypted-undefined
Fix error on accessing encrypted media without keys
2021-08-18 15:17:55 +02:00
David Baker 5fa0908752
Merge pull request #6624 from SimonBrandner/fix/call-tile-button/18565
Fix call tile buttons
2021-08-18 12:03:18 +01:00
David Baker 7616f3ae56
Merge pull request #6621 from SimonBrandner/fix/call-tile-spacing/18558
Fix vertical call tile spacing issues
2021-08-18 12:02:53 +01:00
David Baker 24e3a91f6f
Merge pull request #6618 from SimonBrandner/fix/long-names-call-tiles
Fix long display names in call tiles
2021-08-18 11:56:09 +01:00
David Baker 3a733d1604
Merge pull request #6616 from SimonBrandner/fix/access-token-overflow
Avoid access token overflow
2021-08-18 11:54:40 +01:00
David Baker 946ae73e1d
Merge pull request #6615 from SimonBrandner/fix/media-error
Properly handle media errors
2021-08-18 11:54:08 +01:00
Šimon Brandner f5cbc9f598
Fix pagination and improve typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-18 10:02:42 +02:00
RiotRobot d5ffdf1196 Reset matrix-js-sdk back to develop branch 2021-08-17 09:42:20 +01:00
RiotRobot 0f9e8f280a Merge branch 'master' into develop 2021-08-17 09:41:43 +01:00
RiotRobot 0dd479c466 v3.28.1 2021-08-17 09:40:11 +01:00
RiotRobot 19746f7ac1 Prepare changelog for v3.28.1 2021-08-17 09:40:10 +01:00
RiotRobot 6e82b064ec Upgrade matrix-js-sdk to 12.3.1 2021-08-17 09:29:20 +01:00
RiotRobot 0f382efb46 Resetting package fields for development 2021-08-16 15:02:29 +01:00
RiotRobot 95f8b1b278 Merge branch 'master' into develop 2021-08-16 15:01:31 +01:00
RiotRobot c4de03ddb0 v3.28.0 2021-08-16 14:45:13 +01:00
RiotRobot fc50870ae5 Prepare changelog for v3.28.0 2021-08-16 14:45:12 +01:00
Dariusz Niemczyk 9dfa01e1a8
Fix error on accessing encrypted media without keys
In case where the message is encrypted and you request cross-signed keys
from another session you may end up in a situation where `media` doesn't
exist as you didn't receive keys, yet you have the message's type.
This commit fixes this problem by checking if the media is even available.
2021-08-16 15:30:48 +02:00
Šimon Brandner 93fee442e6
Fix call tile buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 15:30:45 +02:00
RiotRobot 62e1a30532 Upgrade matrix-js-sdk to 12.3.0 2021-08-16 14:21:59 +01:00
David Baker 1880d61ba7
Merge pull request #6623 from matrix-org/dbkr/update_allchange
Update changelog generator
2021-08-16 13:31:22 +01:00
David Baker e3930638dc Fix dates 2021-08-16 13:25:59 +01:00
David Baker d0e82ee603 Update changelog generator 2021-08-16 13:18:10 +01:00
David Baker 891e9b58b4
Merge pull request #6622 from SimonBrandner/release/fix/glare/18538
[Release] Fix glare related regressions
2021-08-16 12:40:26 +01:00
Šimon Brandner 8770317b36
Properly handle call change
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 13:32:53 +02:00
David Baker be18178015
Merge pull request #6614 from SimonBrandner/fix/glare/18538
Fix glare related regressions
2021-08-16 12:28:10 +01:00
Šimon Brandner c375b6058f
Fix call tile spacing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 11:04:41 +02:00
Germain b2e9b89169
Merge pull request #6617 from SimonBrandner/fix/long-names-call-toast
Fix long display names in call toasts
2021-08-16 09:54:29 +01:00
Šimon Brandner bd2ae762d6
Adjust max-non-narrow-width
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:08:30 +02:00
Šimon Brandner c856d433d6
Trim long display names
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:08:16 +02:00
Šimon Brandner ae19055734
Fix long display names in call toasts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 09:34:28 +02:00
Šimon Brandner 84ad1bec6c
Avoid access token overflow
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 14:40:31 +02:00
Šimon Brandner 64aa53ab24
Correctly handle media errors
The methods need to be async since play() is async, otherwise there is no point in having the try catch blocks

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 13:33:49 +02:00
Šimon Brandner a6cde3256e
Properly handle call change
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 12:56:29 +02:00
Dariusz Niemczyk 7b72931c42
Merge pull request #6422 from libexus/i18n-bracket-fix
Remove misplaced bracket in a translation string
2021-08-15 09:20:00 +02:00
David Baker 1842cd1688
Merge pull request #6613 from matrix-org/dbkr/crosssigningpanel_ts
Convert CrossSigningPanel to TS
2021-08-13 18:27:34 +01:00
David Baker c28d449f3f Fix import
thanks vscode
2021-08-13 18:21:59 +01:00
David Baker 7c8637f5db Add MatrixEvent type 2021-08-13 18:18:48 +01:00
David Baker c79b6a412d Merge remote-tracking branch 'origin/develop' into dbkr/crosssigningpanel_ts 2021-08-13 18:11:54 +01:00
David Baker e78640572d Convert CrossSigningPanel to TS
Type: task
2021-08-13 18:07:58 +01:00
David Baker ed7dea9b62
Merge pull request #6612 from SimonBrandner/release/fix/held-call-pip
[Release] Fix PiP of held calls
2021-08-13 17:50:49 +01:00
David Baker 65eedd00b0
Merge pull request #6611 from SimonBrandner/fix/held-call-pip
Fix PiP of held calls
2021-08-13 17:50:26 +01:00
Šimon Brandner 7eabb85e61
Fix PiP of held calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 18:44:51 +02:00
Šimon Brandner 0ee59a17de
Fix PiP of held calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 18:42:55 +02:00
Travis Ralston da944b2c6b
Merge pull request #6323 from matrix-org/t3chguy/ts/12
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to TS
2021-08-13 10:08:58 -06:00
Michael Telatynski df282807b1
Merge pull request #5659 from matrix-org/t3chguy/a11y/composer-list-autocomplete 2021-08-13 16:55:46 +01:00
Travis Ralston 26d5b93760
Merge pull request #6610 from SimonBrandner/feature/add-more-call-states
Add new call tile states
2021-08-13 08:51:31 -06:00
Šimon Brandner 7faf5f040f
Merge remote-tracking branch 'upstream/develop' into feature/add-more-call-states 2021-08-13 16:43:03 +02:00