mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
34282 commits 215 branches 561 tags 411 MiB
Commit graph

34282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Townsend
a11193e243 Group ACLs with MELS 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-28 12:36:40 -04:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht 
Removes the override on the Bubble Container
 2021-06-28 16:23:40 +01:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Michael Telatynski
494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731 2021-06-28 16:08:12 +01:00
Michael Telatynski
500be0d0d8
Merge pull request #6276 from matrix-org/t3chguy/fix/17805 
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
 2021-06-28 15:47:34 +01:00
Michael Telatynski
56514d51a6 Fix tiny scrollbar dot on chrome/electron in Forward Dialog 2021-06-28 15:37:28 +01:00
Germain
53a6089cc9
Merge pull request #6268 from matrix-org/gsouquet/upgrade-puppeteer 2021-06-28 10:28:56 +01:00
Germain
a576362c74
Merge pull request #6275 from matrix-org/gsouquet/toast-button-kind 2021-06-28 09:10:09 +01:00
Germain Souquet
96857ab7f7 Fix end-to-end tests rejectToast 2021-06-28 09:01:04 +01:00
Germain Souquet
d669f55b60 Make toast dismiss button less prominent 2021-06-28 08:52:15 +01:00
Travis Ralston
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice 
Encrypt the voice message file if needed
 2021-06-28 01:30:16 -06:00
Travis Ralston
c16228b8ca
Update src/voice/VoiceRecording.ts 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-28 01:22:05 -06:00
J. Ryan Stinnett
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786 
Fix hyper-precise presence
 2021-06-26 18:47:17 +01:00
Šimon Brandner
3c6612df93
Fix hyper-precise presence 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 07:53:42 +02:00
Travis Ralston
b5bb767b8f Appease the linter 2021-06-25 14:11:50 -06:00
Travis Ralston
cb0d2a2c4f Encrypt the voice message file if needed 
Fixes https://github.com/vector-im/element-web/issues/17729

"oops, should have done that"
 2021-06-25 13:54:05 -06:00
Michael Telatynski
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770 2021-06-25 15:43:33 +01:00
Germain Souquet
b492072e76 add required dependency in Docker image for puppeteer 2021-06-25 15:01:28 +01:00
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski
2e940b7763
Update res/css/structures/_RoomStatusBar.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-06-25 14:47:17 +01:00
Germain Souquet
2672516b6a Upgrade puppeteer to use newer version of Chrome 2021-06-25 14:47:16 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Michael Telatynski
b371abe556
Merge pull request #6266 from matrix-org/t3chguy/fix/17768 
Fix space avatar management layout being broken
 2021-06-25 11:58:41 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Michael Telatynski
620e14eb4b Fix space avatar management layout being broken 2021-06-25 11:10:37 +01:00
Michael Telatynski
a8649ca091 i18n 2021-06-25 11:02:33 +01:00
Michael Telatynski
1c8e24023e Fix space preview for when user cannot join the space 2021-06-25 11:00:27 +01:00
Michael Telatynski
5facee56b0 Fix space settings using join rule private instead of invite 2021-06-25 10:41:45 +01:00
Michael Telatynski
2b9e2e2e85 Fix private space creation setting an alias anyway 2021-06-25 10:41:13 +01:00
Michael Telatynski
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile 2021-06-24 17:05:16 +01:00
Michael Telatynski
767b8cd5c7
Merge pull request #6260 from matrix-org/t3chguy/2 
Fix UserInfo not working when rendered without a room
 2021-06-24 16:37:35 +01:00
Michael Telatynski
d83a92959b Fix UserInfo not working when rendered without a room 2021-06-24 16:30:40 +01:00
Šimon Brandner
ff11244de8
Trailing spaces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 17:27:53 +02:00
Šimon Brandner
e282c4aa54
Simplifie code 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-24 17:23:42 +02:00
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Šimon Brandner
cc1f68296e
Iterate 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:58:56 +02:00
Šimon Brandner
dc2f71bee6
Even more fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:55:44 +02:00
Travis Ralston
006c6df205
Merge pull request #6253 from matrix-org/travis/leave-reasons 
Update membership reason handling, including leave reason displaying
 2021-06-24 08:52:34 -06:00
Šimon Brandner
b065f6d1a4
Remove sdk... 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:48:36 +02:00
Šimon Brandner
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile 2021-06-24 16:44:13 +02:00
Šimon Brandner
c0a1127cb7
Fix PowerStatus 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:43:11 +02:00
Šimon Brandner
f08b92309f
Iterate EntityTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:35:33 +02:00
Michael Telatynski
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1 2021-06-24 15:23:59 +01:00
Šimon Brandner
8fb788ae56
Iterate EntityTile once more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:39:51 +02:00
Šimon Brandner
5b21cff240
Iterate MemberTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:38:21 +02:00
Šimon Brandner
1b64cd0c88
Iterate PresenceLabel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:36:22 +02:00
Michael Telatynski
f6bb0f4e75
Merge pull request #6258 from matrix-org/t3chguy/fix/17752 2021-06-24 13:34:45 +01:00
Šimon Brandner
e436e28f01
Make TS happy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:31:04 +02:00
Šimon Brandner
298e505381
Iterate EntityTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:29:24 +02:00
Michael Telatynski
cc1ff2ce1c Remove unused import 2021-06-24 13:28:16 +01:00