mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 15:19:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
29296 commits 217 branches 561 tags 443 MiB
Commit graph

29296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikita Epifanov
8b5ad673c6 Translated using Weblate (Russian) 
Currently translated at 99.7% (2357 of 2362 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-10-16 10:43:34 +00:00
Michael Albert
ac25638f62 Translated using Weblate (German) 
Currently translated at 99.8% (2358 of 2362 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-10-16 10:43:31 +00:00
J. Ryan Stinnett
ce8a4c017f
Merge pull request #5327 from matrix-org/jryans/sso-4s-integration 
Add security customisation points
 2020-10-16 11:43:21 +01:00
J. Ryan Stinnett
388cb0e2c1 Add security customisation points 
This adds various customisations point in the app for security related
decisions. By default, these do nothing, but would be customised at the
app level via module replacement (so that no changes are needed here in the
SDK).

Fixes https://github.com/vector-im/element-web/issues/15350
 2020-10-16 11:21:44 +01:00
Weblate
58422f717c Merge branch 'origin/develop' into Weblate. 2020-10-15 17:34:12 +00:00
Michael Telatynski
84111a2eaf
Merge pull request #5326 from matrix-org/t3chguy/fix/11195 
Discard all mx_fadable legacy cruft which is totally useless
 2020-10-15 18:34:03 +01:00
Weblate
8cda307642 Merge branch 'origin/develop' into Weblate. 2020-10-15 16:48:59 +00:00
Michael Telatynski
0c87df4957
Merge pull request #5319 from matrix-org/t3chguy/fix/null-avatar 
Fix background-image: url(null) for backdrop filter
 2020-10-15 17:48:51 +01:00
Michael Telatynski
6a82a1f3c7
Update src/components/structures/LeftPanel.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-15 17:15:01 +01:00
Michael Telatynski
3e548bbc94 tidy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:57:07 +01:00
Michael Telatynski
916c78d4cf delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:56:16 +01:00
Weblate
127821fb4c Merge branch 'origin/develop' into Weblate. 2020-10-15 15:49:10 +00:00
Travis Ralston
5c79f35cc5
Merge pull request #5316 from matrix-org/travis/less-acl-noise 
Make the ACL update message less noisy
 2020-10-15 09:49:03 -06:00
Weblate
9ed05c13ed Merge branch 'origin/develop' into Weblate. 2020-10-15 15:48:18 +00:00
random
0a23e762da Translated using Weblate (Italian) 
Currently translated at 99.9% (2358 of 2359 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2020-10-15 15:48:18 +00:00
Michael Telatynski
9234a58bdf
Merge pull request #5318 from matrix-org/t3chguy/fix/9232 
Fix aspect ratio of avatar before clicking Save
 2020-10-15 16:48:07 +01:00
Michael Telatynski
6b01b6ac6c Discard all mx_fadable legacy cruft which is totally useless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:13:16 +01:00
Michael Telatynski
efbce309d0 improve paddings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:42:08 +01:00
Michael Telatynski
f198b95579 Iterate PR; tidy and improve widget context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:24:42 +01:00
David Baker
7ad366603a Support rejecting calls 
Use the 'reject' method when we want to reject an incoming call
rather than end one that's in progress. Also get our error messages
right for the other side rejecting the call (albeit still with
placeholder dialog-box UX).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1510
 2020-10-15 14:54:03 +01:00
Michael Telatynski
f5479d87fe delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 11:28:14 +01:00
Michael Telatynski
a6c81a903c Iterate with new buttons and resize locking 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 11:14:48 +01:00
Weblate
2a98ae4f38 Merge branch 'origin/develop' into Weblate. 2020-10-14 22:37:14 +00:00
Travis Ralston
edcdd950f7
Merge pull request #5323 from matrix-org/travis/jitsi-popout-fix 
Don't supply popout widgets with widget parameters
 2020-10-14 16:37:06 -06:00
Weblate
cadbf54450 Merge branch 'origin/develop' into Weblate. 2020-10-14 22:34:58 +00:00
Travis Ralston
ef90562824
Merge pull request #5301 from ginnyTheCat/rainbow-color 
Changed rainbow algorithm
 2020-10-14 16:34:50 -06:00
Weblate
41d5ea5f80 Merge branch 'origin/develop' into Weblate. 2020-10-14 22:33:40 +00:00
Travis Ralston
3edb6b2234
Merge pull request #5309 from RinkiyaKeDad/fix-final-10 
Renamed TagPanel and TagOrderStore
 2020-10-14 16:33:31 -06:00
Travis Ralston
25db3ac6aa Fix _groupFilterOrderStoreToken naming 2020-10-14 16:32:23 -06:00
Travis Ralston
43208c01a1 Fix variable naming 2020-10-14 16:30:38 -06:00
Travis Ralston
3a88b263c8 Don't supply popout widgets with widget parameters 
Fixes https://github.com/vector-im/element-web/issues/15443
 2020-10-14 13:54:27 -06:00
Weblate
0cf5e3355e Merge branch 'origin/develop' into Weblate. 2020-10-14 16:08:55 +00:00
Szimszon
a4b5ebf8f2 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2359 of 2359 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2020-10-14 16:08:55 +00:00
Travis Ralston
7cce8a3196
Merge pull request #5321 from matrix-org/travis/fix-line 
Fix/clarify boolean logic for reaction previews
 2020-10-14 10:08:41 -06:00
Travis Ralston
dccea97762 Fix/clarify boolean logic for reaction previews 2020-10-14 08:56:08 -06:00
Arsh Sharma
a5d01f2f4d missed a replacement 2020-10-14 17:18:50 +05:30
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Arsh Sharma
7e4b32c0d2 fixing i18 error 2020-10-14 16:44:58 +05:30
Michael Telatynski
efad42439e Fix background-image: url(null) for backdrop filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 11:41:24 +01:00
Arsh Sharma
f705796477 fixing errors 2020-10-14 16:04:41 +05:30
Weblate
7014a6c747 Merge branch 'origin/develop' into Weblate. 2020-10-14 10:20:31 +00:00
David Baker
f60dff5f0c
Merge pull request #5311 from matrix-org/dbkr/its_glare 
Support glare for VoIP calls
 2020-10-14 11:20:25 +01:00
Weblate
63b9623389 Merge branch 'origin/develop' into Weblate. 2020-10-14 10:15:36 +00:00
Michael Telatynski
12be6c34da
Merge pull request #5314 from matrix-org/t3chguy/ts/3 
Round of Typescript conversions
 2020-10-14 11:15:30 +01:00
Michael Telatynski
00e35dafb3 Fix aspect ratio of avatar before clicking Save 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 10:57:34 +01:00
Michael Telatynski
b7a1e698df fix tests which use a private method 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 10:47:46 +01:00
Michael Telatynski
2ea2068d95 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/3 2020-10-14 10:43:38 +01:00
Weblate
2f3fe4118d Merge branch 'origin/develop' into Weblate. 2020-10-14 09:27:24 +00:00
Michael Telatynski
dce047e25c
Merge pull request #5317 from matrix-org/t3chguy/fix/11510 
Fix broken rendering of Room Create when showHiddenEvents enabled
 2020-10-14 10:27:18 +01:00
Michael Telatynski
d36fafd0c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
	src/components/views/elements/AppTile.js
	src/components/views/rooms/AppsDrawer.js
 2020-10-14 10:23:44 +01:00