OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
36,172 Commits
215 Branches
561 Tags
434 MiB
Commit Graph

94 Commits (b333612deab879160da92f8b4409d88ae6d4b398)

Author SHA1 Message Date
Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Michael Telatynski ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-09 08:13:39 +01:00
Šimon Brandner 916589e2b9
Eighth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:24:33 +02:00
Michael Telatynski e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Michael Telatynski e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
J. Ryan Stinnett ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski 0ae4e7b11d Fix typescript types 2021-06-18 16:21:46 +01:00
Michael Telatynski cce4ccb157 Fix types in SlashCommands which assumed something was a promise but it wasn't 2021-06-17 11:37:06 +01:00
Michael Telatynski db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01:00
Michael Telatynski 12bdbd50f1
Merge pull request #5853 from matrix-org/t3chguy/fix/16925 
Fix unknown slash command error exploding
 2021-04-19 17:15:59 +01:00
Michael Telatynski fd54fa5119 Fix unknown slash command error exploding 2021-04-13 10:33:32 +01:00
Travis Ralston 9805170a6f
Update SlashCommands.tsx 2021-04-12 14:34:24 -06:00
Travis Ralston cc4d145f14 Fix js-sdk import in SlashCommands 
This is important because the `matrix-js-sdk` types are mismatched in some builds of Element
 2021-04-12 14:07:17 -06:00
Robin Townsend 8a709b3bf9 Merge branch 'develop' into spoiler-command 2021-03-25 18:20:29 -04:00
Travis Ralston da7d31aeb6
Merge pull request #5686 from robintown/reply-commands 
Support replying with a message command
 2021-03-24 09:56:56 -06:00
Robin Townsend f1fabd831c Add /spoiler command 
As a temporary measure until we have an extensible Markdown parser.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-26 20:34:01 -05:00
Robin Townsend c25a8b70fa Support sending invite reasons with /invite command 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-26 17:10:20 -05:00
Robin Townsend 563620484d Support replying with a message command 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-25 14:59:47 -05:00
David Baker e787d11c73 Merge remote-tracking branch 'origin/develop' into dbkr/virtual_rooms_v2 2021-02-16 19:41:54 +00:00
Jaiwanth d73648dfb0 Modified regex to account for an immediate new line after slash commands 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 17:46:32 +05:30
David Baker 196507a730 VoIP virtual rooms, mk II 
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
 2021-02-12 20:55:54 +00:00
Šimon Brandner 0c5a8f8adb
Added commands for DM conversion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-13 15:30:09 +01:00
Emmanouil Kampitakis f4d3668214 Add the unflip slashcommand 
Signed-off-by: Emmanouil Kampitakis <info+github@kampitakis.de>
 2020-12-18 12:19:37 +01:00
Emmanouil Kampitakis 98a1b7a2d8 Add the tableflip slashcommand 
Signed-off-by: Emmanouil Kampitakis <info+github@kampitakis.de>
 2020-12-18 12:19:37 +01:00
nurjinn jafar 6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer ede67684e4
Removed trailing space 2020-11-26 18:27:35 +01:00
Steffen Kolmer 27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
David Baker 50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold 
Implement call hold
 2020-11-10 08:41:34 +00:00
David Baker 5cccb2848e make quotes consistent 2020-11-05 09:49:14 +00:00
David Baker 333b13802f Support thirdparty lookup for phone numbers 
As per MSC2845. Hidden behind /query for now, until we hook it up
to a dial pad.
 2020-11-04 15:32:21 +00:00
David Baker 7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
David Baker f828c6d494 Implement call hold 
Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
 2020-10-29 17:56:24 +00:00
Michael Telatynski c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
nurjinn jafar 1c6d28b861 refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout 2020-10-21 13:37:36 +02:00
Steffen Kolmer 48633f76ab added event handling back 2020-10-19 23:10:43 +02:00
Steffen Kolmer 607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Steffen Kolmer c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
Michael Telatynski f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Michael Telatynski 6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Travis Ralston 77f715ba73 Fix i18n and analytics 2020-09-09 14:55:27 -06:00
Travis Ralston 9b5823cccb Run the rageshake command through the bug report dialog 
Ideally we encourage users to give us information like a github issue or options to download their logs.
 2020-09-09 14:53:38 -06:00
Michael Telatynski 80b22d1f82
Merge pull request #5158 from dkanada/patch-1 
add lenny face command
 2020-09-07 14:28:40 +01:00
dkanada bc9ea04118
add lenny face command 2020-08-29 20:29:43 +09:00
Michael Telatynski 9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
nurjinn jafar 95051a42b1 checking for unreadMessages before sending confetti 
throwing the confetti on the sender's side
change sendHtmlMessage to sendTextMessage in slashCommands
 2020-08-26 18:56:23 +02:00
nurjinn jafar 5753c96431 a workaround to make ocnfetti work on recipient side. 
changed the implementation of on.Event.decrypted function
 2020-08-25 16:39:57 +02:00
nurjinn jafar 1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 
 Conflicts:
	src/SlashCommands.tsx
	src/i18n/strings/de_DE.json
 2020-08-25 11:52:48 +02:00
nurjinn jafar 43f266bfe3 remove unused import 
fix if condition
 trying (pass the dispatcher to sendHtmlMessage)
 2020-08-25 11:11:20 +02:00
nurjinn jafar b79cf1e7ad updated translated string 2020-08-24 13:59:11 +02:00