OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
33,236 Commits
217 Branches
561 Tags
467 MiB
Commit Graph

33236 Commits (0e221ae5488c99935f09a051f3da121ac5899e47)

Author SHA1 Message Date
Travis Ralston b56d7c9ae8 Scale voice message clock with user's font size 
Fixes https://github.com/vector-im/element-web/issues/17185
 2021-05-07 19:27:52 -06:00
Travis Ralston c2ae6c279b
Merge pull request #5991 from robintown/forbid-encryption-redaction 
Forbid redaction of encryption events
 2021-05-07 19:19:55 -06:00
Aaron Raimist fa307ee14c
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-05-07 18:41:47 -05:00
Robin Townsend 119c14c3f9 Forbid redaction of encryption events 
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-07 12:49:37 -04:00
Germain Souquet 6e3f8d6a0a Decrypt last events first to avoid shifts when scrolling up 2021-05-07 15:26:16 +01:00
Germain Souquet fa30285c6b Decrypt messages on when used on a timeline 2021-05-07 15:16:54 +01:00
Travis Ralston 04d566e247
Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1 
Fix voice message playback being squished up against send button
 2021-05-07 08:00:45 -06:00
Ayush PS cea5421660 Merge branch 'err' of https://github.com/DantrazTrev/matrix-react-sdk into err 2021-05-07 19:16:35 +05:30
Ayush PS 32edbc155f Merge remote-tracking branch 'origin/develop' into err 2021-05-07 19:16:00 +05:30
Ayush Pratap Singh d758d2b296 Merge branch 'matrix-org:develop' into err 2021-05-07 18:43:02 +05:30
Ayush PS b90a1de178 Merge branch 'develop' into err 2021-05-07 18:37:23 +05:30
Michael Telatynski 1e6c6e9d80
Merge pull request #5983 from matrix-org/t3chguy/fix/16994 
Improve style of notification badges on the space panel
 2021-05-07 13:49:41 +01:00
Michael Telatynski 74bcb921ff
Merge pull request #5990 from matrix-org/t3chguy/ts/parse5 
Add dev dependency for parse5 typings
 2021-05-07 13:49:13 +01:00
Germain Souquet 5bd4120920 Decrypt breadcrumb events for better UX 2021-05-07 12:58:37 +01:00
Michael Telatynski cb13200c2d last minute copy tweak 2021-05-07 11:56:41 +01:00
Michael Telatynski 1fc591628a i18n 2021-05-07 11:51:37 +01:00
Michael Telatynski a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
Michael Telatynski 6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176 
Iterate Spaces admin UX around room management
 2021-05-07 11:47:45 +01:00
Michael Telatynski 237399f13e fix button height inconsistency between Chrome & FF 2021-05-07 11:40:39 +01:00
Germain Souquet 17099c656b Call renamed room::decryptAllEvents method 2021-05-07 11:25:25 +01:00
Michael Telatynski 90fa738734 Fix that one final pesky test 2021-05-07 11:22:10 +01:00
Michael Telatynski f0e61e6286 short circuit automatic switch to related space behaviour and fix tests 2021-05-07 11:08:18 +01:00
Michael Telatynski 9d9dce7a91 update orphan room behaviour test to expect new home space behaviour 2021-05-07 10:48:55 +01:00
Michael Telatynski 57be074811 i18n 2021-05-07 10:48:03 +01:00
Michael Telatynski 6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1 
 Conflicts:
	src/stores/room-list/RoomListStore.ts
 2021-05-07 10:40:07 +01:00
Michael Telatynski 4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski 6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs 
Guard all isSpaceRoom calls behind the labs flag
 2021-05-07 10:28:14 +01:00
Michael Telatynski 9205b74641 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 2021-05-07 10:25:06 +01:00
Michael Telatynski 03ca7e0107 move notification dot on the space panel up by 1px 2021-05-07 10:22:56 +01:00
Michael Telatynski db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01:00
Ayush PS d1f23fb994 Partially added the tests [WIP] 2021-05-07 11:45:52 +05:30
Travis Ralston 65f591b69b Make the tests happier 
Here we just override the workers because we're not expecting to be able to test them this way. The code paths involved shouldn't be touched.
 2021-05-06 22:08:00 -06:00
Travis Ralston f65773ef95 Appease the linter 2021-05-06 21:49:53 -06:00
Travis Ralston b08e47bfe1 Support compatibility points for Safari 
Tested on MacOS Big Sur, Safari 14.0.3
 2021-05-06 21:43:17 -06:00
Travis Ralston b61fe2f8e6 Improve error recovery when starting a recording 
This helps return the microphone access to the user.
 2021-05-06 21:43:17 -06:00
Travis Ralston d270e232fd Fix voice message playback being squished up against send button 
In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.
 2021-05-06 21:41:04 -06:00
Aaron Raimist 1f2895dbe9 Merge branch 'develop' into blank-device-name 2021-05-06 20:19:49 -05:00
Travis Ralston b5c25498c8
Merge pull request #5986 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21
 2021-05-06 19:14:50 -06:00
Travis Ralston 340b6bb224
Merge pull request #5987 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/lodash-4.17.21 
Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests
 2021-05-06 19:14:41 -06:00
dependabot[bot] 137189932e
Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 01:13:47 +00:00
dependabot[bot] b37985a5d2
Bump lodash from 4.17.20 to 4.17.21 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-07 01:13:44 +00:00
Travis Ralston 03ad901453
Merge pull request #5984 from matrix-org/dependabot/npm_and_yarn/ua-parser-js-0.7.28 
Bump ua-parser-js from 0.7.23 to 0.7.28
 2021-05-06 19:13:01 -06:00
Aaron Raimist 5d7535738a
Show device ID in UserInfo when there is no device name 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-05-06 20:01:53 -05:00
dependabot[bot] d924c7a186
Bump ua-parser-js from 0.7.23 to 0.7.28 
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.23 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.28)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 22:22:53 +00:00
Travis Ralston d531e3d59f
Merge pull request #5971 from matrix-org/travis/files/visual 
Update visual style of plain files in the timeline
 2021-05-06 10:57:22 -06:00
Michael Telatynski d2fc1c42b0 Improve style of notification badges on the space panel 2021-05-06 15:58:22 +01:00
Šimon Brandner 7ad270928a
Simplifie code a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-06 16:41:09 +02:00
Šimon Brandner bb9803a94e
Don't try to use the event's metadata to calc the scale 
That has lead to https://github.com/vector-im/element-web/issues/17184

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-06 16:40:33 +02:00
J. Ryan Stinnett 06a9577858 Merge remote-tracking branch 'origin/develop' into jryans/upload-preview-mimetype 2021-05-06 14:45:48 +01:00
J. Ryan Stinnett dc50d27985 Adjust MIME type of upload confirmation if needed 
This filters the MIME type of uploaded files to ensure we display safely.
 2021-05-06 14:39:44 +01:00