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

2263 commits

Author SHA1 Message Date
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-21 12:48:51 +01:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
 2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:48:02 +01:00
Michael Telatynski
334ab12c47 Tidy up widget colouring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:06:35 +01:00
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
06009df05b Update Widget paddings and background colours 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:47:15 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01: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
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
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
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
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
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
Michael Telatynski
447ea9eb23 Relax flexboxes in resizer on window resize 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:11:58 +01:00
Michael Telatynski
ba21c6ed36 Iterate on Widget icons and resizing handles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 15:56:53 +01:00
Michael Telatynski
7be5ff0fe6 First cut of app drawer tiled resizing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:29:12 +01:00
Michael Telatynski
f72b1e0c7d Remove stale things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:27:50 +01:00
Michael Telatynski
c1fef5a941 Improve the styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:36:09 +01:00
Michael Telatynski
7820f9c28a Switch to WidgetAvatar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:16:55 +01:00
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
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
29e3881fb3 Iterate design and fix post-merge conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:36:45 +01:00
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +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
Michael Telatynski
23d95df30b Rebuild the room summary card's widgets section 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:08:41 +01: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