Commit Graph

36629 Commits (458f860a2633c0de41fa69dad360b3a1e40d8da5)

Author SHA1 Message Date
Germain Souquet 458f860a26 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-17 11:14:21 +01:00
Germain Souquet d1dbfbd014 hide thread events from the timeline 2021-08-17 11:10:02 +01:00
Germain Souquet e5024c4b71 Adapt threading UI to new backend 2021-08-17 10:38:09 +01: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
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
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 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 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
David Baker 20ac54f3e7
Merge pull request #6609 from SimonBrandner/feature/left-align-call-tiles
Left align call tiles
2021-08-13 15:41:28 +01:00
Šimon Brandner cda91e44e0
Use new call state icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:37:17 +02:00
Šimon Brandner fa204c4104
Add declined call buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:34:11 +02:00
Šimon Brandner 032d2866a3
Add "No answer" state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:19:14 +02:00
Šimon Brandner c79852a9f0
Left align call tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
David Baker ebc7d9ee1a
Merge pull request #6556 from SimonBrandner/feature/narrow-voip-tiles/18398
Fix call tile behaviour on narrow layouts
2021-08-13 09:44:29 +01:00
Šimon Brandner 5ac5640939
Add a little padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:35:31 +02:00
Šimon Brandner 39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398 2021-08-13 10:30:21 +02:00
David Baker ecb2d9908d
Merge pull request #6608 from matrix-org/dbkr/kill_persistent_jitsi
Fix video call persisting when widget removed
2021-08-12 19:19:12 +01:00
Andrew Morgan 1ad35b1564
Keep number field in focus when pressing dialpad buttons (#6520) 2021-08-12 18:58:06 +01:00
David Baker 3528d87f30 Remove old version 2021-08-12 18:39:11 +01:00
David Baker 657dcaf989 Fix video call persisting when widget removed
Fixes https://github.com/vector-im/element-web/issues/15703
Type: defect
2021-08-12 18:36:57 +01:00
James Salter 1a1a76e2d7
Merge pull request #6606 from SimonBrandner/fix/toast-colors
Fix toast colors
2021-08-12 16:09:03 +01:00
Travis Ralston 23221ceb2e
Merge pull request #6602 from SimonBrandner/release/fix/correct-button
[Release] Use the correct button component for the Call View sidebar button
2021-08-12 08:55:02 -06:00