OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,769 Commits
221 Branches
563 Tags
477 MiB
Commit Graph

397 Commits (748fe59eaa84ec286dee1b62dcb8a401406f1aef)

Author SHA1 Message Date
Michael Telatynski 4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Michael Telatynski 111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 
 Conflicts:
	src/components/views/right_panel/UserInfo.tsx
 2021-10-08 13:00:20 +01:00
Michael Telatynski 2483f1dc90 Add progress bar to restricted room upgrade dialog 2021-10-08 12:20:43 +01:00
Michael Telatynski 1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216 2021-10-06 09:29:25 +01:00
Dariusz Niemczyk 17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2 
Color clean-up #3 mk2
 2021-10-01 11:04:15 +02:00
Jaiwanth 1e90043eb3 Change colour variable for export dialog subheading 2021-09-30 20:58:03 +05:30
Michael Telatynski 8ac77c498f Add progress bar to Community to Space migration tool 
and invite-one-by-one to workaround Synapse ratelimits
 2021-09-30 13:43:59 +01:00
Michael Telatynski 0f8069ac35 Switch ConfirmUserActionDialog over to using a Field 2021-09-28 16:22:27 +01:00
Michael Telatynski 2ac2358d93 Fix avatar getting chopped off 2021-09-28 16:22:05 +01:00
Šimon Brandner 71d1196692
Get rid of message-body-panel colors 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 09:04:51 +02:00
Šimon Brandner 02d42244a8
$user-tile-hover-bg-color -> $header-panel-bg-color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 09:02:09 +02:00
Jaiwanth d1e3d35d40 Change export bundle filename format, light theme for all exports and import jszip after export cta 2021-09-22 22:17:23 +05:30
Jaiwanth 94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Michael Telatynski 1858c63c4a Allow options to cascade kicks/bans throughout spaces 2021-09-17 15:34:49 +01:00
Jaiwanth 7207329c15 Apply review suggestions 2021-08-13 23:44:07 +05:30
Šimon Brandner 8b59bf3d18
$tertiary-fg-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:29 +02:00
Šimon Brandner 10bc85724a
$secondary-fg-color -> $secondary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:26 +02:00
Šimon Brandner e5fd19c332
$primary-fg-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:18:18 +02:00
Šimon Brandner 9ecd3b03f1
$quaternary-fg-color -> $quaternary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:37 +02:00
Šimon Brandner 2afee596a9
$primary-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:34 +02:00
Jaiwanth e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Michael Telatynski 9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Michael Telatynski 54d85a3864 Iterate PR based on feedback 2021-08-11 16:32:48 +01:00
Michael Telatynski f7818e0169 iterate PR based on feedback 2021-08-06 12:05:14 +01:00
Michael Telatynski a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Jaiwanth 17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Michael Telatynski 94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski 3ee8f607c0 Switch dropdown out for radio interaction when leaving space 2021-07-29 15:50:18 +01:00
Michael Telatynski 493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
 2021-07-29 15:22:52 +01:00
Michael Telatynski efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
 2021-07-29 15:16:53 +01:00
Michael Telatynski 40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski 5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01:00
Michael Telatynski 6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Travis Ralston 9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163 
Don't set `font-family` explicitly
 2021-07-27 11:04:23 -06:00
Michael Telatynski 39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Jaiwanth b91309be82 Apply suggestions from review 2021-07-26 23:40:27 +05:30
Michael Telatynski 2114e854f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
 2021-07-26 12:36:00 +01:00
Jaiwanth 06d84a16d0 Delint 2021-07-26 12:58:17 +05:30
Jaiwanth 30a64a1b5a Gray out and hide some options during export 2021-07-26 12:41:36 +05:30
Jaiwanth b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Jaiwanth 3d4d1d32d9 Modify design according to the design team 2021-07-26 00:09:59 +05:30
Michael Telatynski b89434fcbc avoid abusing spans because you're too lazy to give things a class 2021-07-23 16:03:15 +01:00
Michael Telatynski 7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Michael Telatynski 358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
Michael Telatynski 010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +01:00
Germain Souquet 8a9d89ae85 Fix event tile cut off in share preview 2021-07-22 15:05:44 +02:00
Michael Telatynski d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +01:00
Michael Telatynski 880dc26847 don't force height if the height can't change (no children edge) 2021-07-21 10:39:04 +01:00
Michael Telatynski 1b2d70d816 Prompt user to leave rooms/subspaces in a space when leaving space 2021-07-21 09:57:10 +01:00