mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 06:18:24 +03:00
Code Issues Projects Releases Packages Wiki Activity
29011 commits 219 branches 562 tags 474 MiB
Commit graph

29011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steffen Kolmer
3e8e817a3d Fixed merge error 2020-10-19 13:35:18 +02:00
Michael Telatynski
30adc98a15 Fix excessive hosting link padding 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:34:25 +01:00
Steffen Kolmer
929cc48cef Fixed eslint error 2020-10-19 13:30:52 +02:00
Steffen Kolmer
4106f70218 Fixed merge error 2020-10-19 13:24:22 +02:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
Steffen Kolmer
3358ed2792 Use arrow functions 2020-10-19 12:57:57 +02:00
Steffen Kolmer
6e97baf09f Added license 2020-10-19 12:53:17 +02:00
Michael Telatynski
b23fbde306
Merge pull request #5335 from matrix-org/t3chguy/cherry-pick/jitsi-openidc 
[Release] Fix Jitsi OpenIDC auth
 2020-10-19 11:23:01 +01:00
Michael Telatynski
92f89b8dca
Merge pull request #5334 from matrix-org/t3chguy/fix/jitsi-openidc 
Fix Jitsi OpenIDC auth
 2020-10-19 11:11:17 +01:00
Michael Telatynski
596c723dea Fix Jitsi OpenIDC auth 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 11:10:39 +01:00
Michael Telatynski
81990d36b5 Fix Jitsi OpenIDC auth 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 10:49:07 +01:00
David Baker
b10f7a47fd
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups 
Support rejecting calls
 2020-10-19 09:57:13 +01:00
Travis Ralston
d5e9d5306a
Merge pull request #5330 from matrix-org/travis/fix-user-info 
Don't show admin tooling if we're not in the room
 2020-10-16 15:04:06 -06:00
Travis Ralston
5f3f7b5263 Don't show admin tooling if we're not in the room 
Fixes https://github.com/vector-im/element-web/issues/15480
 2020-10-16 13:43:08 -06:00
David Baker
4a26199a75
use real equals 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-16 20:28:20 +01:00
Travis Ralston
aa28459b5a Don't supply popout widgets with widget parameters 
Fixes https://github.com/vector-im/element-web/issues/15443
 2020-10-16 13:03:08 -06:00
Travis Ralston
7ef4de3115 Appease the linter 2020-10-16 13:02:50 -06:00
Travis Ralston
f2c874ccb6 Ensure widgets are destroyed cleanly when minimized 
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)

Also fixes other issues relating to widgets not loading when being minimized/maximized.
 2020-10-16 13:02:42 -06:00
Travis Ralston
3274e2aed5 Run templating on the popout URL too 
Fixes https://github.com/vector-im/element-web/issues/15443
 2020-10-16 13:02:30 -06:00
Michael Telatynski
3a0833e8a4
Merge pull request #5328 from matrix-org/t3chguy/fix/14718 
Show Integrations error if iframe failed to load too
 2020-10-16 15:22:03 +01:00
Michael Telatynski
999d83cb8d Show Integrations error if iframe failed to load too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 13:54:37 +01:00
Michael Telatynski
da7a02b545 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 12:23:10 +01:00
Michael Telatynski
da93be4677 Iterate Widget Context Menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 11:51:27 +01: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
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
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
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
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
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
Travis Ralston
ef90562824
Merge pull request #5301 from ginnyTheCat/rainbow-color 
Changed rainbow algorithm
 2020-10-14 16:34:50 -06: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
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