Compare commits

...

36 Commits

Author SHA1 Message Date
kodiakhq[bot] ed0b4d438d
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 20:47:29 +00:00
kodiakhq[bot] 5fd36ed7c3
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 15:46:00 +00:00
kodiakhq[bot] 925e16ed4e
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 15:08:10 +00:00
kodiakhq[bot] 75ff5bf57b
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 14:57:36 +00:00
kodiakhq[bot] daf397ad63
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 13:58:46 +00:00
kodiakhq[bot] 11d6f84ba3
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 12:45:17 +00:00
kodiakhq[bot] 26399538f8
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 11:34:13 +00:00
kodiakhq[bot] e08d9c6e41
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 11:25:13 +00:00
kodiakhq[bot] 37d15f7bab
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-28 09:13:01 +00:00
kodiakhq[bot] 208d851ebc
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 21:36:19 +00:00
kodiakhq[bot] 9ad688bf30
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 21:23:33 +00:00
kodiakhq[bot] edba31a5a6
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 15:21:58 +00:00
kodiakhq[bot] eea80396a5
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 15:00:36 +00:00
kodiakhq[bot] 3073828d09
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 14:31:11 +00:00
kodiakhq[bot] 40e4743bc9
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 12:18:05 +00:00
kodiakhq[bot] 1b8aa38e22
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 11:10:36 +00:00
kodiakhq[bot] 6905c372dc
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-27 10:59:58 +00:00
kodiakhq[bot] 574ebfa531
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 15:14:37 +00:00
kodiakhq[bot] 4cd6c2e0fe
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 15:03:14 +00:00
kodiakhq[bot] d4e8087210
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 14:13:29 +00:00
kodiakhq[bot] d5e2d16884
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 13:48:47 +00:00
kodiakhq[bot] e474f2066a
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 11:34:29 +00:00
kodiakhq[bot] bcf18f2caf
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 11:18:24 +00:00
kodiakhq[bot] 9f15be52c0
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 08:50:41 +00:00
kodiakhq[bot] 1aa1930b50
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 04:22:40 +00:00
kodiakhq[bot] 9b7dd185e5
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 02:51:14 +00:00
kodiakhq[bot] 6363bb5852
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 02:42:13 +00:00
kodiakhq[bot] 41bf7d9db9
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 02:14:50 +00:00
kodiakhq[bot] 359b5f9300
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-26 00:28:42 +00:00
kodiakhq[bot] 00a153a6b6
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-25 23:28:35 +00:00
kodiakhq[bot] 8f2be78861
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-25 22:22:52 +00:00
kodiakhq[bot] 00972b8259
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-25 20:20:35 +00:00
kodiakhq[bot] afd6a4ecb0
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-25 18:32:42 +00:00
kodiakhq[bot] 3de17ccc30
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-25 17:04:40 +00:00
kodiakhq[bot] c903c32f4a
Merge branch 'main' into fix/1847-support-jitsi-self-hosted 2022-04-25 16:50:42 +00:00
Agusti Fernandez Pardo 328648f1e1 fix: adds support for jitsi selfhosted with envvar 2022-04-25 04:33:57 +02:00
2 changed files with 5 additions and 1 deletions

View File

@ -169,3 +169,7 @@ TANDEM_BASE_URL="https://tandem.chat"
ZOOM_CLIENT_ID=
ZOOM_CLIENT_SECRET=
# *********************************************************************************************************
# - JITSI
# Used for self-hosted jitsi integration
JITSI_INSTANCE_URL=

View File

@ -14,7 +14,7 @@ const JitsiVideoApiAdapter = (): VideoApiAdapter => {
type: "jitsi_video",
id: meetingID,
password: "",
url: "https://meet.jit.si/cal/" + meetingID,
url: process.env.JITSI_INSTANCE_URL || "https://meet.jit.si/cal/" + meetingID,
});
},
deleteMeeting: async (): Promise<void> => {