OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
31,976 Commits
205 Branches
546 Tags
417 MiB
Commit Graph

31976 Commits (5df4ad2db0fed4bd96c73fa5b13cd4994c3a96c7)

Author SHA1 Message Date
RiotRobot 5df4ad2db0 Reset matrix-js-sdk back to develop branch 2021-03-29 13:37:04 +01:00
RiotRobot 1567a343b5 Resetting package fields for development 2021-03-29 13:36:53 +01:00
RiotRobot df59a6bf45 Merge branch 'master' into develop 2021-03-29 13:36:53 +01:00
RiotRobot 397f7f2e0b v3.17.0 2021-03-29 13:35:36 +01:00
RiotRobot 61361395ef Prepare changelog for v3.17.0 2021-03-29 13:35:35 +01:00
RiotRobot 805e980a8a Upgrade matrix-js-sdk to 9.10.0 2021-03-29 13:29:12 +01:00
Germain 096d4102b8
Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit 
Add user settings for warn before exit
 2021-03-29 12:11:55 +01:00
J. Ryan Stinnett 327071d671
Merge pull request #5808 from matrix-org/jryans/tweak-cs-text-release 
[Release] Tweak cross-signing copy
 2021-03-26 17:23:15 +00:00
J. Ryan Stinnett 33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings 
Decouple key bindings from event handling
 2021-03-26 15:14:38 +00:00
Michael Telatynski 83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Travis Ralston f6b119cb71
Merge pull request #5809 from matrix-org/travis/sso-rel 
[RELEASE] Fix crash on login when using social login
 2021-03-26 08:52:20 -06:00
Travis Ralston 1426a4b168 Fix crash on login when using social login 
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.

Fixes https://github.com/vector-im/element-web/issues/16765
 2021-03-26 08:46:41 -06:00
Michael Telatynski a64e0d7611 delint 2021-03-26 14:45:10 +00:00
Hubert Chathi e23583db40
Merge pull request #5763 from uhoreg/room-history-key-sharing2 
Share keys for historical messages when inviting users to encrypted rooms
 2021-03-26 10:41:54 -04:00
Travis Ralston e48dbef054
Merge pull request #5804 from matrix-org/travis/uploads-fix 
Fix upload bar not populating when starting uploads
 2021-03-26 08:08:21 -06:00
Travis Ralston 22b7081475
Merge pull request #5803 from matrix-org/travis/s-sso-login-crash 
Fix crash on login when using social login
 2021-03-26 08:06:34 -06:00
Michael Telatynski af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski 9b4af91014 delint 2021-03-26 13:25:06 +00:00
Michael Telatynski eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
Michael Telatynski d10241b1c4 Fix misalignment on the room search input caused by a 1px transparent border 2021-03-26 13:10:44 +00:00
J. Ryan Stinnett ce19d07850
Merge pull request #5805 from matrix-org/travis/ts/access-ss-dialog 
Convert AccessSecretStorageDialog to TypeScript
 2021-03-26 12:37:24 +00:00
J. Ryan Stinnett 52cda49ba4 Fix tests 2021-03-26 12:14:24 +00:00
J. Ryan Stinnett 9aa1daa3e1 Move toast detail to a new line 2021-03-26 12:14:24 +00:00
J. Ryan Stinnett 4a883f2e88 Tweak cross-signing copy 
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
 2021-03-26 12:14:24 +00:00
J. Ryan Stinnett 5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text 
Tweak cross-signing copy
 2021-03-26 12:12:25 +00:00
J. Ryan Stinnett cf4ed1bcdf Fix tests 2021-03-26 11:56:58 +00:00
Michael Telatynski 4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +00:00
Michael Telatynski aff05eff48 Fix suggested room vanishing when you peek it 2021-03-26 11:48:31 +00:00
J. Ryan Stinnett aed247f44c Move toast detail to a new line 2021-03-26 11:43:41 +00:00
Michael Telatynski 9fb653e522 Fix room space invite button for public spaces 2021-03-26 11:43:01 +00:00
Michael Telatynski 3cee8b2baa fix space creation button busy state 2021-03-26 11:34:41 +00:00
J. Ryan Stinnett fd59a66523 Tweak cross-signing copy 
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
 2021-03-26 11:13:39 +00:00
Michael Telatynski a8c1b7abab Hide space room management checkboxes if you don't have permission at the root space 2021-03-26 09:59:02 +00:00
Michael Telatynski 8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Travis Ralston 264e24fc35
Merge pull request #5791 from thermaq/patch-1 
Fix password change popup message
 2021-03-26 00:07:50 -06:00
Travis Ralston 5d9b36afc1 Fix tests 2021-03-25 23:47:41 -06:00
Travis Ralston 60e05d2e8c Revert back to using sdk.getComponent() 2021-03-25 23:41:35 -06:00
Travis Ralston 550fba49f7 Appease the eternal linter 2021-03-25 23:37:23 -06:00
Travis Ralston 92ee1ad3cc Convert AccessSecretStorageDialog to TypeScript 
This is to make upcoming changes a bit easier to do.
 2021-03-25 23:34:45 -06:00
Travis Ralston 76a05eddfa Fix upload bar not populating when starting uploads 
Fixes https://github.com/vector-im/element-web/issues/16713

See diff for more information
 2021-03-25 22:29:21 -06:00
Travis Ralston 8bc2356fd0 Fix crash on login when using social login 
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.

Fixes https://github.com/vector-im/element-web/issues/16765
 2021-03-25 22:22:43 -06:00
Travis Ralston 318db15e35
Merge pull request #5790 from panoschal/fix/view-source-bug 
View Source: make Event ID go below Event ID
 2021-03-25 19:11:26 -06:00
Travis Ralston 8a33f8cfc6
Merge pull request #5800 from robintown/fix-line-numbers 
Fix line numbers when missing trailing newline
 2021-03-25 19:04:23 -06:00
Michael Telatynski 09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Hubert Chathi db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Hubert Chathi 46fd549ace update with new suggested design 2021-03-25 19:27:14 -04:00
Robin Townsend f1a9c5ae93 Fix line numbers when missing trailing newline 
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-25 17:38:34 -04:00
Michael Telatynski 1f4437af39
Merge pull request #5799 from matrix-org/t3chguy/redaction-groupere 
[Release] Fix edge case with redaction grouper messing up continuations
 2021-03-25 21:17:51 +00:00
Michael Telatynski 75bfaa58bb
Merge pull request #5796 from panoschal/fix/save-editor-state-when-reply-is-open 
Remember reply when switching rooms
 2021-03-25 20:27:57 +00:00
Michael Telatynski 76965285da Fix edge case with redaction grouper messing up continuations 2021-03-25 20:19:59 +00:00