Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-30 06:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,001 Commits 217 Branches 561 Tags 456 MiB
262475f96e
Commit Graph

32001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
262475f96e Add a button to reset personal encryption state during login 2021-03-30 15:37:06 -06:00
Travis Ralston
b68fabb44b
Merge pull request #5801 from matrix-org/travis/voice-messages/waveform 
Show waveform and timer in voice messages
 2021-03-30 12:16:19 -06:00
Travis Ralston
b15412056e It helps to use the right function 2021-03-30 12:08:11 -06:00
Travis Ralston
60326e359a Clarify comment 2021-03-30 12:01:35 -06:00
J. Ryan Stinnett
b089f3d2f9
Merge pull request #5585 from ndarilek/label-base-avatar 
Label unlabeled avatar button in event panel
 2021-03-30 12:21:17 +01:00
J. Ryan Stinnett
7c3a7b54e7
Merge pull request #5810 from matrix-org/t3chguy/fix/167414 
Fix the theme engine breaking with some web theming extensions
 2021-03-30 11:59:09 +01:00
J. Ryan Stinnett
661202839c
Merge pull request #5696 from robintown/spoiler-command 
Add /spoiler command
 2021-03-30 11:58:33 +01:00
Travis Ralston
54412878a1 Merge branch 'develop' into travis/voice-messages/waveform 2021-03-29 22:59:51 -06:00
Travis Ralston
9c2d44805d Revert "Avoid use of deprecated APIs, instead using an AudioWorklet" 
This reverts commit 5c685dcf35.
 2021-03-29 22:57:59 -06:00
Travis Ralston
9998f18d67 Stop React complaining about componentShouldUpdate() 2021-03-29 21:59:45 -06:00
Travis Ralston
5c685dcf35 Avoid use of deprecated APIs, instead using an AudioWorklet 
A bit annoying that it is async, but it'll do.
 2021-03-29 21:59:31 -06:00
Travis Ralston
e523ce6036 Fix float operations to make a little more sense. 2021-03-29 21:25:06 -06:00
Travis Ralston
dfd65516c2
Merge pull request #5802 from matrix-org/travis/voice-messages/sampling 
Don't specify sample rates for voice messages
 2021-03-29 11:44:30 -06:00
J. Ryan Stinnett
3a09c22173
Merge pull request #5812 from matrix-org/jryans/cancel-security-key 
Tweak security key error handling
 2021-03-29 17:58:11 +01:00
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
02548cf743 Tweak security key error handling 
This reworks error handling of "use security key" so we stop the overall
operation when cancelling access (instead of just the immediate prompt). In
addition, flowing the error to outer catch block also handles resetting state to
re-display the initial verification choices.

Fixes https://github.com/vector-im/element-web/issues/15584
 2021-03-26 18:01:03 +00: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
Michael Telatynski
230919dd66 fix issue with injected styles exploding the theme engine 2021-03-26 15:43:59 +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