Germain
745a8d3860
Explain isSmall proper for CountryDropdown
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:18:33 +01:00
Weblate
c47ff9189c
Merge branch 'origin/develop' into Weblate.
2021-07-20 15:38:24 +00:00
Michael Telatynski
91cf27e252
Merge pull request #6401 from Palid/fix/15142/fix-grecaptcha-race-condition
2021-07-20 16:38:19 +01:00
Šimon Brandner
9fb872cade
Sort feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:34:47 +02: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
Šimon Brandner
3993e698bd
Put the call controls close togather
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:22:36 +02:00
Šimon Brandner
4546df7246
Update sidebar icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:13:54 +02:00
Weblate
bf4239b3e6
Merge branch 'origin/develop' into Weblate.
2021-07-20 15:08:57 +00:00
Ihor Hordiichuk
d77842d497
Translated using Weblate (Ukrainian)
...
Currently translated at 47.0% (1431 of 3044 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2021-07-20 15:08:57 +00:00
Travis Ralston
7ea17aee3c
Merge pull request #6386 from matrix-org/travis/voice-messages/download
...
Move download button for media to the action bar
2021-07-20 09:08:50 -06:00
Šimon Brandner
cfaf4b8078
Correct sidebar behaviour when muting local video
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:08:17 +02:00
Travis Ralston
7892539a9b
delint
2021-07-20 09:03:26 -06:00
Šimon Brandner
c7a28491ca
Correct sidebar toggle behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:58:44 +02: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
44e240e12d
Doc some values
2021-07-20 08:55:07 -06:00
Šimon Brandner
0af64504b1
Reverse sidebar order
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:53:53 +02:00
Travis Ralston
32d8da2c74
Remove useless image reference
2021-07-20 08:52:55 -06:00
Šimon Brandner
690905d01e
Show sidebar button only when screen-sharing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:51:47 +02:00
Šimon Brandner
15406eaff2
Put the sidebar to the bottom rather than the top
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:18:48 +02:00
Šimon Brandner
3751f04cef
Add "You are presenting toast"
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:17:07 +02:00
Šimon Brandner
e5563ac60b
Update the screen-sharing buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:11:55 +02:00
Šimon Brandner
0a282b587b
Reorder buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:07:27 +02:00
Šimon Brandner
fadb13e9fb
Center all buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:02:02 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
Weblate
affbdcc97b
Merge branch 'origin/develop' into Weblate.
2021-07-20 13:38:09 +00:00
Travis Ralston
4a877300da
Merge pull request #6405 from matrix-org/travis/files-hover
...
Remove hover effect from files in the files panel
2021-07-20 07:38:04 -06:00
Weblate
4a99dad130
Merge branch 'origin/develop' into Weblate.
2021-07-20 13:02:23 +00:00
Michael Telatynski
340d09d457
Merge pull request #6415 from matrix-org/t3chguy-patch-1
...
Revert accidental renaming of dispatcherRef
2021-07-20 14:02:19 +01:00
Michael Telatynski
ad50d23cc2
Revert accidental renaming of dispatcherRef
2021-07-20 13:56:49 +01:00
Weblate
e9d186d3f7
Merge branch 'origin/develop' into Weblate.
2021-07-20 12:32:01 +00:00
jelv
fa7106eca1
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (3046 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-20 12:32:01 +00: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
Šimon Brandner
9e5b149291
Fix event highlighthing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
Weblate
6ab11215fb
Merge branch 'origin/develop' into Weblate.
2021-07-20 11:57:13 +00:00
Besnik Bleta
4b47ab31ec
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (3039 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-07-20 11:57:13 +00:00
jelv
d812d968e2
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (3046 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-20 11:57:09 +00:00
Michael Telatynski
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates
2021-07-20 12:57:00 +01:00
Robin Townsend
cc40dd7998
Move some code around for clarity
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-20 07:47:31 -04:00
Šimon Brandner
6491a00645
Add some types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:47:07 +02:00
Robin Townsend
bd80201643
Constrain emoji skins type even further
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-20 07:46:54 -04:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02: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
Weblate
f913f0ee19
Merge branch 'origin/develop' into Weblate.
2021-07-20 10:23:41 +00:00