enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
42,834 Commits 1 Branch 7 Tags
7a80ea4bbe95adec14abc79a5bb8206cda170e61
Commit Graph

12860 Commits

Author SHA1 Message Date
Travis Ralston f98eee318e Fill out fields for MSC2873 values 
As required by https://github.com/matrix-org/matrix-widget-api/pull/36
 2021-05-12 14:10:02 -06:00
Travis Ralston 3aef3b72b5 Move language handling into languageHandler 2021-05-12 14:08:32 -06: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 5430f44c27 Convert verification and UntrustedDeviceDialog to TS 2021-05-12 17:08:44 +01:00
Michael Telatynski 565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +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
Germain bd2917aa69 Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +01:00
Travis Ralston 7bd1a2b87f Merge pull request #5972 from SimonBrandner/fix/17164/remember-collapsed-state 
Persistent space collapsed states
 2021-05-11 23:23:48 -06:00
Šimon Brandner 262fc40afb Move comment to the correct place 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-12 07:12:00 +02:00
Travis Ralston 9842bcde50 Merge pull request #6010 from ndarilek/develop 
Catch another instance of unlabeled avatars.
 2021-05-11 21:44:15 -06: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
Nolan Darilek 006aa2d5b9 Catch another instance of unlabeled avatars. 
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
 2021-05-11 09:39:06 -05:00
Jaiwanth 240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
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
Michael Telatynski f0342b0ea7 Merge pull request #6009 from matrix-org/t3chguy/fix/15359 
Improve permissions error when adding new server to room directory
 2021-05-11 12:36:40 +01:00
Michael Telatynski b0f23aa65b Improve permissions error when adding new server to room directory 2021-05-11 12:20:18 +01:00
Šimon Brandner 834579f778 Don't render any audio non-primary feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 13:07:30 +02:00
Michael Telatynski 60e7089c77 post-merge fixes, the new keybindings stuff made it messy 2021-05-11 11:14:21 +01:00
Michael Telatynski 60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-05-11 10:59:22 +01:00
Šimon Brandner 1b877f2b7c Make SpaceTreeLevelLayoutStore into a singleton 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:16:14 +02:00
Šimon Brandner 4115fd8695 Rewrite SpaceTreeLevelLayoutStore to save paths 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:13:13 +02:00
Michael Telatynski 5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Šimon Brandner 965af1a642 Initial SpaceTreeLevelLayoutStore implementation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 08:08:02 +02:00
Jaiwanth 87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Šimon Brandner bc0ff5bbea Merge branch 'develop' into fix/17164/remember-collapsed-state 2021-05-11 07:38:08 +02:00
Jaiwanth 4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth 376befd38e Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston 12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston 122565b3ac Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Robin Townsend c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Robin Townsend 503301aa89 Make rooms in ForwardDialog clickable 
…so that you can jump to a room easily once you've forwarded a message
there.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 13:00:06 -04:00
Michael Telatynski 70d7a59ea2 Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 
Switch the Home Space out for an All rooms space
 2021-05-10 16:26:05 +01:00
Michael Telatynski 95b43d1284 Merge pull request #5985 from aaronraimist/blank-device-name 
Show device ID in UserInfo when there is no device name
 2021-05-10 16:19:56 +01:00
Michael Telatynski 3a75eb1226 Fix handling of enter/return in space creation menu 2021-05-10 14:39:10 +01:00
Šimon Brandner acd0fa4c0e Add a comment about when it is possible to screenshare 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 14:42:06 +02:00
J. Ryan Stinnett 4311d91372 Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta 
Don't use the event's metadata to calc the scale of an image
 2021-05-10 13:06:08 +01:00
Šimon Brandner 90f4ad7a83 Always sort feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 13:21:02 +02:00
Šimon Brandner 135cdb2255 Add dialog with info about the screensharing change 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 12:37:40 +02:00
Šimon Brandner 2749715050 Remove screensharing call type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 12:26:28 +02: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
Robin Townsend 09ba74a851 Disable forward buttons for rooms without send permissions 
…and add a tooltip to explain why they can't accept forwarded messages.
It was chosen to disable the buttons rather than hide the entries from
the list, since hiding them without explanation could cause confusion.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 01:10:41 -04:00
Robin Townsend 100efb1a90 Fix ForwardDialog crashing when rendering reply 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 00:40:54 -04:00
Robin Townsend c96888c9cb Make ForwardDialog more readable 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 00:38:01 -04:00
Robin Townsend 219c983d19 Use import instead of sdk.getComponent 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-09 10:58:44 -04:00
Jaiwanth 1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30