enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
33,135 Commits 1 Branch 7 Tags
6aa477f0f52eeb875c251962f588a83a34f66404
Commit Graph

1528 Commits

Author SHA1 Message Date
Michael Telatynski 6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski 52420feab0 Merge pull request #6021 from matrix-org/t3chguy/fix/17268 
Iterate beta feedback dialog
 2021-05-12 17:42:42 +01:00
Michael Telatynski 607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski 2c89be312a Disable space fields whilst their form is busy 2021-05-12 13:30:00 +01:00
J. Ryan Stinnett 23869cdaa7 Add missing space on beta feedback dialog 2021-05-12 12:32:39 +01:00
Michael Telatynski 7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Michael Telatynski 7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Michael Telatynski bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-05-11 14:07:47 +01:00
Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
J. Ryan Stinnett 45acf70b00 Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype 
Adjust MIME type of upload confirmation if needed
 2021-05-10 10:21:35 +01:00
Michael Telatynski a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
J. Ryan Stinnett dc50d27985 Adjust MIME type of upload confirmation if needed 
This filters the MIME type of uploaded files to ensure we display safely.
 2021-05-06 14:39:44 +01:00
J. Ryan Stinnett 437f13cf76 Convert UploadConfirmDialog to TSX 2021-05-06 14:11:34 +01:00
Michael Telatynski 90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Michael Telatynski 9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski 70087b30bf Add disclaimer about subspaces being experimental in add existing dialog 2021-05-05 17:53:31 +01:00
Michael Telatynski 07f5b6e8c4 Add retry mechanism and progress bar to add existing to space dialog 2021-05-05 11:45:12 +01:00
Michael Telatynski e9f59ed093 Merge pull request #5943 from matrix-org/t3chguy/fix/17082 
Sort rooms in the add existing to space dialog based on recency
 2021-05-04 10:57:23 +01:00
Šimon Brandner 5913203dc6 Merge branch 'develop' into fix-indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 20:08:14 +02:00
Šimon Brandner 232b87a3b4 Improve formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 19:57:02 +02:00
Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
 2021-04-29 09:52:21 +01:00
Michael Telatynski bed52319bc Sort rooms in the add existing to space dialog based on recency 2021-04-28 23:39:24 +01:00
Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-04-28 22:49:36 +01:00
Michael Telatynski c5f653245a Show Spaces beta card in Labs & My Communities view 
the image is temporary
 2021-04-27 16:29:42 +01:00
Šimon Brandner 46bfbbadf9 Enable indent rule and fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-27 17:23:27 +02:00
J. Ryan Stinnett dd8abb0206 Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts 
Convert some Flow-typed files to TypeScript
 2021-04-27 13:44:47 +01:00
Michael Telatynski 31b9a4c312 Merge pull request #5928 from matrix-org/t3chguy/hidpi 
Scale all mxc thumbs using device pixel ratio for hidpi
 2021-04-27 10:56:23 +01:00
Michael Telatynski b9cca469b6 Merge pull request #5918 from matrix-org/t3chguy/fix/17050 
Fix add existing to space dialog no longer showing rooms for public spaces
 2021-04-27 09:46:37 +01:00
Michael Telatynski 915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi 
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
 2021-04-26 18:25:49 +01:00
Michael Telatynski 0d538c490a Merge pull request #5921 from matrix-org/t3chguy/fix/17063 
Autofocus search box in the add existing to space dialog
 2021-04-26 18:24:14 +01:00
Michael Telatynski 8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Michael Telatynski 1e7eedba02 Use label element in add existing to space dialog for easier hit target 2021-04-26 11:29:08 +01:00
Michael Telatynski 9319dd5400 Autofocus search box in the add existing to space dialog 2021-04-26 11:24:28 +01:00
Michael Telatynski 1c7d68bb16 invert and outdent 2021-04-25 09:35:18 +01:00
Michael Telatynski 4411498057 Fix add existing to space dialog no longer showing rooms for public spaces 2021-04-25 09:33:44 +01:00
J. Ryan Stinnett d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
Michael Telatynski 63ed9c271b Merge pull request #5866 from ColonisationCaptain/develop 
Add missing space in seshat dialog and the corresponding string
 2021-04-20 09:02:53 +01:00
Michael Telatynski 379df7f24d Merge pull request #5883 from matrix-org/t3chguy/fix/16704 
Fix typo in method call in add existing to space dialog
 2021-04-19 17:53:10 +01:00
Michael Telatynski 4082a03769 Fix typo in method call in add existing to space dialog 2021-04-19 17:32:45 +01:00
Michael Telatynski 12d96fe096 Merge pull request #5881 from matrix-org/t3chguy/fix/16704 
Clean up add existing to space dialog and include DMs in it too
 2021-04-19 17:29:09 +01:00
Michael Telatynski e01caba068 Clean up add existing to space dialog and include DMs in it too 2021-04-19 08:54:06 +01:00
Germain Souquet 3a91dff711 Check if address type is mx-user-id 2021-04-15 14:13:37 +01:00
Germain Souquet 3b66821258 move DM invite responsiblity to the server side 2021-04-14 19:59:17 +01:00
ColonisationCaptain c521be2d16 add missing spaces 2021-04-14 14:28:41 +01:00
Germain Souquet 8b2dc22fe1 fix closing modal when finished 2021-04-14 09:37:06 +01:00
Germain Souquet f89bbea3f1 Ensure room is synced with account before sending invites 2021-04-14 09:03:47 +01:00
Germain Souquet 8d95c012ef refactor _startDm invite flow to use async/await 2021-04-14 08:44:33 +01:00
Travis Ralston 72a9bda3b7 One less try/catch 2021-04-12 14:57:21 -06:00
Travis Ralston 106de5f7ba Merge branch 'develop' into travis/reset-passphrase 2021-04-12 14:55:31 -06:00