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
J. Ryan Stinnett
437f13cf76
Convert UploadConfirmDialog to TSX
2021-05-06 14:11:34 +01:00
J. Ryan Stinnett
6e0c7611c3
Extract blob-safe MIME types
2021-05-06 13:53:27 +01:00
Michael Telatynski
d9912651d6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
...
Conflicts:
src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24
Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent
2021-05-06 13:05:58 +01:00
Germain Souquet
0c87a67caf
Lazily decrypt events on room view
2021-05-06 11:46:25 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
...
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
90538c95aa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
2021-05-06 08:05:14 +01:00
Aaron Raimist
9aa711b7b7
Merge branch 'develop' into initialisation
2021-05-06 00:09:48 -05:00
Aaron Raimist
f1413532e7
Revert "Also fix translations"
...
This reverts commit 284b9e48ce
2021-05-06 00:08:15 -05:00
Michael Telatynski
9518e4d415
Guard all isSpaceRoom calls behind the labs flag
2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119
...
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +01:00
Michael Telatynski
202dfd4521
Merge pull request #5976 from matrix-org/t3chguy/fix/17153
...
Improve performance of search all spaces and space switching
2021-05-05 22:13:05 +01:00
Travis Ralston
2236ec3eff
Move and update variable usage
2021-05-05 14:00:56 -06:00
Travis Ralston
60e3a8ac77
Merge branch 'develop' into travis/files/visual
2021-05-05 13:47:33 -06:00
Travis Ralston
3e1265b9bb
Merge pull request #5970 from matrix-org/travis/voicemessages/colors
...
Update colours and sizing for voice messages
2021-05-05 11:09:18 -06:00
Michael Telatynski
70087b30bf
Add disclaimer about subspaces being experimental in add existing dialog
2021-05-05 17:53:31 +01:00
Michael Telatynski
2b703e8574
tweak code style
2021-05-05 17:30:14 +01:00
Michael Telatynski
650933096a
Iterate Spaces admin UX around room management
2021-05-05 17:25:29 +01:00
J. Ryan Stinnett
fa2b5103e2
Merge pull request #5973 from SimonBrandner/fix/17165/readme-android-sdk
...
Update link to Android SDK
2021-05-05 17:10:11 +01:00
Šimon Brandner
39ef376a79
Use Android SDK instead
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-05-05 18:06:42 +02:00
J. Ryan Stinnett
62774d7c16
Merge pull request #5962 from jaiwanth-v/cleanup-imageview
...
Add cleanup functions for image view
2021-05-05 17:02:43 +01:00
J. Ryan Stinnett
5daad1de67
Merge pull request #5961 from SimonBrandner/fix/15460/allow-p2p-calls
...
Add a note about sharing your IP in P2P calls
2021-05-05 16:59:06 +01:00
Travis Ralston
570c082573
Promote colour to a variable
...
I refuse to try and type this variable name freehand.
2021-05-05 09:58:45 -06:00
Michael Telatynski
81b97590f6
fix styling of the disabled danger_outline button
2021-05-05 16:51:46 +01:00
Michael Telatynski
01fa25f3fa
Merge pull request #5968 from matrix-org/t3chguy/fix/17044
...
Only aggregate DM notifications on the Space Panel in the Home Space
2021-05-05 16:35:07 +01:00
Michael Telatynski
7cae566011
Merge pull request #5975 from matrix-org/t3chguy/fix/16891
...
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 16:32:31 +01:00
J. Ryan Stinnett
4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal
...
Warn on access token reveal
2021-05-05 16:32:12 +01:00
Michael Telatynski
7f396bedd0
add comment
2021-05-05 15:59:02 +01:00
Michael Telatynski
4279e99e4c
Improve performance of search all spaces and space switching
2021-05-05 15:29:04 +01:00
Michael Telatynski
886959f32d
port rate limiting code over to space creation wizard's add existing rooms
2021-05-05 11:54:14 +01:00
Michael Telatynski
acce9a4548
Fix rounded progress bars
2021-05-05 11:50:55 +01:00
Michael Telatynski
07f5b6e8c4
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 11:45:12 +01:00
Šimon Brandner
2044ff0149
Correctly handle defaults
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 11:48:55 +02:00
Šimon Brandner
374d8c1c4c
Update link to Android SDK
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 08:43:24 +02:00
Šimon Brandner
791f39abcc
Initial support for persistent collapsed states
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 08:31:07 +02:00
