mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
32109 commits 203 branches 553 tags 406 MiB
Commit graph

32109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer 
Attended transfer
 2021-04-01 17:34:30 +01:00
Germain
151749b675
Merge pull request #5822 from matrix-org/gsouquet-user-autocomplete-nonprefix 2021-04-01 14:01:50 +01:00
Germain
5ac1d3a456
Merge pull request #5806 from matrix-org/gsouquet-seshat-reset 2021-04-01 09:22:02 +01:00
Germain Souquet
a4345811b0 Merge branch 'develop' into gsouquet-seshat-reset 2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01 Update seshat reset dialog copy 2021-04-01 09:03:50 +01:00
Germain Souquet
4fcb258981 Refactor SeshatResetDialog props interface to use IDialogProps 2021-04-01 08:58:39 +01:00
Travis Ralston
2ab304189d
Merge pull request #5816 from aaronraimist/redact-re-request 
Prevent Re-request encryption keys from appearing under redacted messages
 2021-03-31 18:23:47 -06:00
Germain Souquet
c81847689a Remove query matcher shouldMatchPrefix support 2021-03-31 18:21:02 +01:00
J. Ryan Stinnett
7c4437ac9b
Merge pull request #5815 from czeidler/keybindings-follow-up 
Keybindings follow up
 2021-03-31 17:54:05 +01:00
Germain
b7ee11a356
Merge pull request #5821 from matrix-org/gsouquet-default-visible-tiles 
Increase default visible tiles for room sublists
 2021-03-31 17:17:17 +01:00
Germain
5e21a86da9
Merge pull request #5817 from matrix-org/gsouquet-docs 
Change copy to point to native node modules docs in element desktop
 2021-03-31 12:51:36 +01:00
J. Ryan Stinnett
58343c7699 Fix search error typo 
This fixes a typo in the recently added search error message.
 2021-03-31 11:55:21 +01:00
Germain Souquet
377b6c8a05 Make user autocomplete query search beyond prefix 2021-03-31 11:41:22 +01:00
Germain Souquet
3f33060cdd increase default visible tiles for room sublists 2021-03-31 11:15:16 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01: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
Germain Souquet
2a4e327dbf Change copy to point to native node modules docs in element desktop 2021-03-29 16:03:06 +01:00
Germain Souquet
b38f5c9459 Simplify event index store reset flow 2021-03-29 15:46:58 +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
Germain Souquet
e53a8ad992 Refactor SeshatResetDialog in TypeScript 2021-03-29 08:44:27 +01:00
Aaron Raimist
4974cb43af
Prevent Re-request encryption keys from appearing under redacted messages 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-03-28 22:35:12 -05:00
Clemens Zeidler
be00320def Make use of the KeyBindingsManager in the ScrollPanel 
Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2021-03-29 13:38:15 +13:00
Clemens Zeidler
57cd8afbc4 Split ApplySelection into CompleteOrPrevSelection and CompleteOrNextSelection 
When moving through the autocomplete selection list distinguish between
the following cases:
1) When there is no autocomplete window open, only open one and select
the first item when the CompleteOrPrevSelection /
CompleteOrNextSelection actions are emitted (e.g. by pressing SHIFT +
TAB, TAB)
2) Otherwise navigate through the selection list (e.g. SHIFT + TAB, TAB,
UP, DOWN)

- Remove references to raw keyboard events in autocomplete.ts
- Clarify the purpose of startSelection (previously onTab)

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2021-03-29 13:38:03 +13:00
Clemens Zeidler
7d087524a5 Make use of the KeyBindingManager in LeftPanel 
LeftPanel was making key action decisions based on the forwarded event.
Use the KeyBindingManager now.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2021-03-28 20:00:53 +13: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