80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120
...
Improve new layout switcher UI
2021-07-21 15:11:58 +01:00
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
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
c155382445
Improve new layout switcher UI
2021-07-21 14:55:30 +02:00
ae51653348
Add null guard for room prop in EventTile
2021-07-21 12:41:02 +02:00
5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions
2021-07-21 11:30:15 +01:00
b31b8f1b41
Remove old container sizing comment
...
Co-authored-by: James Salter <jamess@element.io >
2021-07-21 09:13:12 +01:00
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
794c49c5db
Migrate MStickerBody to TypeScript
2021-07-21 09:52:09 +02:00
54841d63dc
Fix wrench-tests by importing EmbeddedPage through sdk.getComponent
2021-07-21 09:29:33 +02:00
1d1d93ed14
Apply code review suggestion
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-21 03:17:55 -04:00
45f9f3e13e
Name functions better
2021-07-20 23:34:27 -06:00
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
aefdac1115
Fix error when hovering over non-emoji reactions
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-20 22:41:49 -04:00
3372a77248
Remove grecaptcha from globals thanks to #6412
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-20 17:45:47 +01:00
efce2d16f1
Merge branch 'develop' into gsouqet/ts-migration-1
2021-07-20 18:43:08 +02:00
745a8d3860
Explain isSmall proper for CountryDropdown
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-20 17:18:33 +01:00
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
7892539a9b
delint
2021-07-20 09:03:26 -06:00
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
44e240e12d
Doc some values
2021-07-20 08:55:07 -06:00
32d8da2c74
Remove useless image reference
2021-07-20 08:52:55 -06:00
ad50d23cc2
Revert accidental renaming of dispatcherRef
2021-07-20 13:56:49 +01:00
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
...
Add VoIP event tiles
2021-07-20 13:31:53 +01:00
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates
2021-07-20 12:57:00 +01:00
cc40dd7998
Move some code around for clarity
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-20 07:47:31 -04:00
bd80201643
Constrain emoji skins type even further
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-20 07:46:54 -04:00
6cb1c5d918
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 13:20:30 +02:00
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
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint
2021-07-20 11:23:36 +01:00
596fb774e3
Remove sdk.getComponent instructions
2021-07-20 12:22:32 +02:00
b94886a291
i18n irc and fix lint from merge conflict
2021-07-20 11:18:27 +01:00
d3934ff7da
Merge branch 'develop' into t3chguy/eslint
2021-07-20 11:08:13 +01:00
e38682d75c
Remove unwanted coma in EventTile
2021-07-20 12:05:18 +02:00
9fe9534e01
fix three lints
2021-07-20 10:33:52 +01:00
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
2021-07-20 10:22:41 +01:00
dd65d47fba
lint fix
2021-07-20 11:12:17 +02:00
848b83015d
not sure how these happened :/
2021-07-20 09:37:54 +01:00
e6869797d7
remove unused prop
2021-07-20 09:27:32 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
e11e17eb85
Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014
2021-07-20 09:11:28 +01:00
fdd98bbf3f
linter fix
2021-07-20 09:55:26 +02:00
bb03fd90c8
Merge branch 'develop' into gsouqet/ts-migration-1
2021-07-20 09:02:48 +02:00
5db20d9431
Fix placeholder centering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 08:54:32 +02:00
e9963cd22c
Make emoji skins type more specific
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-19 21:57:03 -04:00
5614ef1675
Rename some variables since their purpose has changed
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-19 21:54:25 -04:00
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
f8a922eaa1
Apply code review suggestions
...
including filling in gaps in emoji shortcode coverage.
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-19 15:09:15 -04:00
b36c748940
Fix avatar placeholders not getting capitalized
...
Regressed by 096d0a7d12robin@robin.town >
2021-07-19 12:48:44 -04:00
6862d97961
APPEASE THY JSON
2021-07-19 10:18:15 -06:00
Germain