Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski e79ad34fbd EventTile make use of EventType enum 
Removes m.room.encryption from non-state list as it makes no sense
 2021-04-13 09:34:37 +01:00
Thai Localization b744e97fd0 Translated using Weblate (Thai) 
Currently translated at 45.4% (15 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/th/
 2021-04-13 08:34:24 +00:00
Travis Ralston cd7fd24b1a Translated using Weblate (English (United States)) 
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/en_US/
 2021-04-13 08:34:21 +00:00
Šimon Brandner f9fde3670d Set target to _blank 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:15:42 +02:00
Šimon Brandner b1091a22a3 Don't render context menu button if mxEvent is missing 
The button is useless and doesn't work if we're viewing an avatar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:11:09 +02:00
Šimon Brandner e1446f01e4 Make ImageView static 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:07:17 +02:00
Šimon Brandner f1c80fcede Call onCloseDialog straigh away 
This avoids some delay in the dialog disappearing

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:04:50 +02:00
Travis Ralston 1de7828e4d Write out docs explicitly. 2021-04-12 14:59:56 -06:00
Travis Ralston 72a9bda3b7 One less try/catch 2021-04-12 14:57:21 -06:00
Travis Ralston 106de5f7ba Merge branch 'develop' into travis/reset-passphrase 2021-04-12 14:55:31 -06:00
Travis Ralston 9805170a6f Update SlashCommands.tsx 2021-04-12 14:34:24 -06:00
Travis Ralston ee9e1a72cb Merge pull request #5838 from matrix-org/travis/add-acl-pl 
Give server ACLs a name in 'roles & permissions' tab
 2021-04-12 14:13:30 -06:00
Travis Ralston cc4d145f14 Fix js-sdk import in SlashCommands 
This is important because the `matrix-js-sdk` types are mismatched in some builds of Element
 2021-04-12 14:07:17 -06:00
Germain Souquet 9081f80008 Move user to welcome_page if continuing with previous session 2021-04-12 17:01:27 +01:00
RiotRobot cd93f29691 Merge branch 'master' into develop 2021-04-12 15:35:40 +01:00
RiotRobot 48132c9eab v1.7.25 2021-04-12 15:35:26 +01:00
RiotRobot 4f58ba1b22 Prepare changelog for v1.7.25 2021-04-12 15:35:25 +01:00
RiotRobot fb0bc34042 Reset matrix-react-sdk back to develop branch 2021-04-12 15:33:08 +01:00
RiotRobot f38aedae85 Reset matrix-js-sdk back to develop branch 2021-04-12 15:32:56 +01:00
RiotRobot ecf41e6fa5 Merge branch 'master' into develop 2021-04-12 15:32:45 +01:00
RiotRobot 643897a204 Merge branch 'develop' of github.com:vector-im/element-web into develop 2021-04-12 15:32:40 +01:00
RiotRobot 0bc5a01228 v1.7.25 v1.7.25 2021-04-12 15:29:40 +01:00
RiotRobot 95fb11a2b9 Prepare changelog for v1.7.25 2021-04-12 15:29:40 +01:00
RiotRobot 19748762a5 Upgrade matrix-react-sdk to 3.18.0 2021-04-12 15:27:10 +01:00
RiotRobot d1d6ef55ff Upgrade matrix-js-sdk to 9.11.0 2021-04-12 15:26:37 +01:00
Šimon Brandner 56b15edc58 Properly handle media 
This might have resulted in the wrong speaker being used or worse

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-12 16:19:05 +02:00
RiotRobot f743007334 Reset matrix-js-sdk back to develop branch 2021-04-12 14:57:30 +01:00
RiotRobot 219de0e554 Resetting package fields for development 2021-04-12 14:56:58 +01:00
RiotRobot a008c3d4e6 Merge branch 'master' into develop 2021-04-12 14:56:05 +01:00
RiotRobot 736507b812 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2021-04-12 14:51:22 +01:00
RiotRobot 51ea02cbab v3.18.0 2021-04-12 14:50:05 +01:00
RiotRobot a3db08ccc0 Prepare changelog for v3.18.0 2021-04-12 14:50:04 +01:00
Michael Telatynski 3faf7280fe Merge pull request #5845 from matrix-org/t3chguy/fix/16844 
Don't hide notification badge on the home space button as it has no menu
 2021-04-12 14:49:35 +01:00
Michael Telatynski 187eef4f2d Merge pull request #5843 from matrix-org/t3chguy/fix/16896 
User Info hide disambiguation as we always show MXID anyway
 2021-04-12 14:49:19 +01:00
RiotRobot f844961dc4 Upgrade matrix-js-sdk to 9.11.0 2021-04-12 14:45:16 +01:00
Michael Telatynski 4aef7a879a Merge pull request #5846 from matrix-org/t3chguy/fix/16822 
Improve kick state to not show if the target was not joined to begin with
 2021-04-12 14:45:13 +01:00
Michael Telatynski d9adf0ddd8 Merge pull request #5844 from matrix-org/t3chguy/fix/16877 
Fix space store wrongly switching to a non-space filter
 2021-04-12 14:44:46 +01:00
RiotRobot 8af81ea90f Revert "Change to inset" 
Safari doesn't support `inset`.

This reverts commit b3706b682e.
 2021-04-12 14:37:11 +01:00
J. Ryan Stinnett 0db9d71071 Merge pull request #5848 from matrix-org/jryans/reason-message-tweaks-release 
[Release] Tweak appearance of invite reason
 2021-04-12 14:23:01 +01:00
J. Ryan Stinnett 19d7ccac07 Rename toggle to view 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett b3706b682e Change to inset 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 32049f849c Remove blur effect 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 650421eefb Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 098a8711a7 Merge pull request #5847 from matrix-org/jryans/reason-message-tweaks 
Tweak appearance of invite reason
 2021-04-12 13:36:20 +01:00
J. Ryan Stinnett 8a1180bd50 Rename toggle to view 2021-04-12 13:19:13 +01:00
J. Ryan Stinnett 0e5e48584f Change to inset 2021-04-12 13:18:03 +01:00
J. Ryan Stinnett 7f796640f6 Remove blur effect 2021-04-12 13:11:27 +01:00
J. Ryan Stinnett 798a891d83 Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 12:28:42 +01:00
Michael Telatynski c1d88be260 Improve kick state to not show if the target was not joined to begin with 2021-04-12 12:13:28 +01:00
Michael Telatynski a00af446b3 Don't hide notification badge on the home space button as it has no context menu 2021-04-12 11:55:47 +01:00