Commit graph

14643 commits

Author SHA1 Message Date
Travis Ralston
b9b37f59f1
Merge pull request #6432 from matrix-org/travis/voice-messages/colours
Clean up visual style of files and voice messages
2021-07-22 03:39:29 -06:00
Michael Telatynski
e665e38b7b
Merge pull request #6413 from SimonBrandner/ts/address-stuff 2021-07-22 09:35:40 +01:00
Michael Telatynski
9219661d7c
Merge pull request #5389 from matrix-org/t3chguy/fix/15536
Fix onPaste handler to work with copying files from Finder
2021-07-22 09:22:55 +01:00
Jaiwanth
76040c652c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-07-22 08:25:24 +05:30
Travis Ralston
c384575375
Merge pull request #6261 from robintown/watch-show-timestamps
Add alwaysShowTimestamps and others to RoomView setting watchers
2021-07-21 19:44:04 -06:00
Travis Ralston
3023fda497 Make MFileBody inherit the MediaBody styles 2021-07-21 14:46:25 -06:00
Travis Ralston
36d4eb85e1 Restore 'use default' naming on room notifications
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
2021-07-21 13:01:19 -06:00
Šimon Brandner
34f3e62f72
Types!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 20:48:50 +02:00
Germain
0d8309c8fc
Merge pull request #6429 from matrix-org/gsouquet/fix-18146 2021-07-21 17:17:51 +01:00
Germain Souquet
26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
Germain Souquet
43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
Germain
80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120
Improve new layout switcher UI
2021-07-21 15:11:58 +01:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Travis Ralston
34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1
Play only one audio file at a time
2021-07-21 07:58:46 -06:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Germain Souquet
ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Germain
b31b8f1b41
Remove old container sizing comment
Co-authored-by: James Salter <jamess@element.io>
2021-07-21 09:13:12 +01:00
Germain Souquet
a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet
794c49c5db Migrate MStickerBody to TypeScript 2021-07-21 09:52:09 +02:00
Germain Souquet
54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
Travis Ralston
45f9f3e13e Name functions better 2021-07-20 23:34:27 -06:00
Travis Ralston
a759d61ba0 Play only one audio file at a time
Fixes https://github.com/vector-im/element-web/issues/17439
2021-07-20 23:28:07 -06:00
Šimon Brandner
862932cce5
Don't use require
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 18:48:18 +02:00
Germain Souquet
efce2d16f1 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 18:43:08 +02:00
Germain
745a8d3860
Explain isSmall proper for CountryDropdown
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:18:33 +01:00
Dariusz Niemczyk
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
* develop: (141 commits)
  delint
  Doc some values
  Remove useless image reference
  Revert accidental renaming of dispatcherRef
  Fix event highlighthing
  Move some code around for clarity
  Constrain emoji skins type even further
  Delint
  i18n irc and fix lint from merge conflict
  Remove unwanted coma in EventTile
  fix three lints
  lint fix
  not sure how these happened :/
  remove unused prop
  Update eslint-plugin-matrix-org
  Fix placeholder centering
  Make emoji skins type more specific
  Rename some variables since their purpose has changed
  Conform to new react and typescript eslint rules
  Apply code review suggestions
  ...
2021-07-20 17:33:05 +02:00
Travis Ralston
7892539a9b delint 2021-07-20 09:03:26 -06:00
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00
Travis Ralston
32d8da2c74 Remove useless image reference 2021-07-20 08:52:55 -06:00
Michael Telatynski
ad50d23cc2
Revert accidental renaming of dispatcherRef 2021-07-20 13:56:49 +01:00
David Baker
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
Add VoIP event tiles
2021-07-20 13:31:53 +01:00
Michael Telatynski
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Šimon Brandner
6cb1c5d918
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:20:30 +02:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Šimon Brandner
c3399b110d
Fix setTimeout retrun type?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:48:38 +02:00
Šimon Brandner
333608c4c4
sdk.getComponent shall die
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:42:21 +02:00
Šimon Brandner
73187156d4
Disable eslint line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:38:14 +02:00
Šimon Brandner
b1f4ba28d7
Merge remote-tracking branch 'upstream/develop' into ts/address-stuff 2021-07-20 12:31:18 +02:00
Šimon Brandner
3cb7a6ab78
Improve more typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:30:41 +02:00
Šimon Brandner
1fc5138cfe
Convert AppPermission to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:27:20 +02:00
Michael Telatynski
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint 2021-07-20 11:23:36 +01:00
Germain Souquet
596fb774e3 Remove sdk.getComponent instructions 2021-07-20 12:22:32 +02:00
Michael Telatynski
b94886a291 i18n irc and fix lint from merge conflict 2021-07-20 11:18:27 +01:00
Šimon Brandner
48949af961
Improve typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:16:33 +02:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Germain Souquet
e38682d75c Remove unwanted coma in EventTile 2021-07-20 12:05:18 +02:00
Šimon Brandner
a747bbbae7
Convert AddressPickerDialog to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:08 +02:00
Šimon Brandner
156901ce62
Convert AddressTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:08 +02:00
Šimon Brandner
28871ee07d
Convert AddressSelector to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:07 +02:00