mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
28921 commits 215 branches 561 tags 411 MiB
Commit graph

2438 commits

Author SHA1 Message Date
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +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
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
Travis Ralston
43208c01a1 Fix variable naming 2020-10-14 16:30:38 -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
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
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
bb52bad099 Remove stale props and CSS classes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:23:49 +01:00
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
J. Ryan Stinnett
576ea6df08 Use same colour variable as text 2020-10-08 10:01:05 +01:00
J. Ryan Stinnett
73ce2fac8a Add comment on colour 2020-10-08 09:56:58 +01:00
J. Ryan Stinnett
43ea5de320 Adjust Settings styles 2020-10-07 20:23:34 +01:00
J. Ryan Stinnett
3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
J. Ryan Stinnett
936344b012 Make back button a circle 2020-10-07 17:53:41 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
40292884bf Regenerate component CSS index 2020-10-07 13:09:03 +01:00
J. Ryan Stinnett
f2b72efe39 Remove various remaining bits of ILAG flows 
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
 2020-10-07 12:53:59 +01:00
Michael Telatynski
ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width 
Remove width limit on widgets
 2020-10-06 10:23:19 +01:00
Michel Zimmer
80091f7db2 Fix call container avatar initial centering 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-06 08:59:03 +02:00
Michael Telatynski
fdb8cb78f9
Merge pull request #5277 from matrix-org/t3chguy/fix/9551 
Use Own Profile Store for the Profile Settings
 2020-10-05 14:46:12 +01:00
Michael Telatynski
cf37f0abf2 Fix the AvatarSetting avatar getting crushed by the flexbox 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-05 12:54:01 +01:00
Michel Zimmer
58bbbf31b9 Fix room directory clipping links in the room's topic 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-02 18:00:58 +02:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup 
Make the hangup button do things for conference calls
 2020-09-29 11:06:21 -06:00
Travis Ralston
36882b85d7
Merge pull request #5222 from matrix-org/travis/ft-sep1620/03-jitsi-obvious 
Render Jitsi widget state events in a more obvious way
 2020-09-29 11:05:40 -06:00
Travis Ralston
a5569303d1 Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip 
Make the PIP Jitsi look and feel like the 1:1 PIP
 2020-09-29 10:18:30 -06:00
Michael Telatynski
123dada465 Remove width limit on widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 14:49:02 +01:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5 Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious 2020-09-28 13:41:48 -06:00
Bruno Windels
603415c2ec fix index mismatch 2020-09-28 16:20:16 +02:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120 
Rework profile area for user and room settings to be more clear
 2020-09-24 08:39:01 -06:00
Travis Ralston
aa0e19daf0 Make the hover transition a variable 2020-09-24 08:23:06 -06:00
Michael Telatynski
956a3bf69d Implement Left Panel User Widget 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 09:28:49 +01:00
Travis Ralston
e658d9619b Update styles for new colours 2020-09-23 12:30:01 -06:00
Travis Ralston
1ab2e06887 Clean up unused variables 2020-09-23 12:29:49 -06:00
Michael Telatynski
7fd6d4498f Make bottom sticky room list header dynamic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-23 11:00:19 +01:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files 
Add a note to use the desktop builds when seshat isn't available
 2020-09-22 10:25:34 -06:00
Travis Ralston
3e0cbd7bfe Appease the linters 2020-09-21 21:09:46 -06:00
Travis Ralston
4f983ad9a1 Rework profile sections of user and room settings 
Mostly by design request. Some is freehand, to be reviewed.
 2020-09-21 21:00:51 -06:00
Travis Ralston
6fee3d8f4f Spread out the general user settings sections like the other tabs 
By design request.
 2020-09-21 18:37:08 -06:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720 
Adjust layout and formatting of notifications / files cards
 2020-09-18 11:11:35 -06:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup 
Defer encryption setup until first E2EE room
 2020-09-18 10:28:33 +01:00
Travis Ralston
849a5e4a39 Round the jitsi pip corners 2020-09-17 14:58:48 -06:00
Travis Ralston
f5f48cbc21 Fix indentation 2020-09-17 10:44:58 -06:00
Travis Ralston
4657a34bbb Document some of the magic values 2020-09-17 10:44:18 -06:00
Travis Ralston
14a7b83988 Don't show a bottom border ahead of the date separator 2020-09-17 10:40:48 -06:00