1
0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-22 18:32:29 +01:00
Commit Graph

3063 Commits

Author SHA1 Message Date
Madeline
02bb548953 Merge branch 'feat/latestWebClient' into slowcord 2022-07-20 20:49:23 +10:00
Madeline
3bbaa1a08b Merge branch '2fa' into feat/latestWebClient
Add placeholder codes-verification and view-backup-codes-challenge routes
2022-07-20 20:48:17 +10:00
Madeline
428e101a86 Merge branch '2fa' into slowcord 2022-07-20 20:31:18 +10:00
Madeline
5cdcc48d1b 2fa 2022-07-20 20:14:30 +10:00
Nobody
257b81d0b9 chore!: update docker scripts (#797)
BREAKING CHANGE: this new docker image no longer clones this repository. Some manual steps are required
* chore!: update docker scripts
* chore: fix paths in docker scripts
* chore: add config docker compose
2022-07-20 09:43:34 +03:00
Madeline
baba1c5349 Merge branch 'feat/captchaVerify' into slowcord 2022-07-20 15:46:16 +10:00
Madeline
45e88be53d Captcha checking 2022-07-20 15:44:59 +10:00
Madeline
8a569d884a Merge branch 'feat/captchaVerify' into slowcord 2022-07-20 15:33:27 +10:00
Madeline
3f0c992e13 Captcha checking 2022-07-20 15:30:50 +10:00
Madeline
7f8da7095c Captcha required message on login/register 2022-07-20 15:14:34 +10:00
Madeline
2c8eadb9ef Fix content type for captcha check 2022-07-20 15:07:39 +10:00
Madeline
8d9816879f Hcaptcha backend 2022-07-20 14:39:35 +10:00
Madeline
3b9ffce42c Hcaptcha support on login/register 2022-07-20 14:09:01 +10:00
Nobody
469e55fffa chore: fix package.json scripts
npx should be used to execute local package binaries
2022-07-19 10:20:36 +03:00
Madeline
c1b096cfd1 Merge branch 'feat/defaultFeatures' into slowcord 2022-07-18 19:49:03 +10:00
Madeline
3cd5bc39e3 Default features config 2022-07-18 19:48:43 +10:00
Madeline
b208088c0e Display network/api errors on login/register page 2022-07-18 17:36:14 +10:00
Madeline
c58c3fddd1 Merge branch 'fix/messageLinkMetas' into slowcord 2022-07-17 21:05:31 +10:00
Madeline
2b5de2d1ac Message embeds use image width/height 2022-07-17 21:05:10 +10:00
Madeline
c7551a83b8 Merge branch 'master' into fix/messageLinkMetas 2022-07-17 20:49:49 +10:00
Madeline
e891ddb412 Redirect guild profile cdn stuff to normal avatar route while guild profiles are TODO 2022-07-17 19:49:43 +10:00
Madeline
b19d9fe294 Attempt to fix headers being set after send to client in send message 2022-07-17 15:56:58 +10:00
Madeline
e007bec1b2 the merge broke compile??? 2022-07-17 13:28:27 +10:00
Madeline
16914cbccd Merge branch 'fosscord:master' into slowcord 2022-07-17 13:26:04 +10:00
Madeline
cd129e9352 remove some default rights that I gave like an idiot 2022-07-17 13:21:49 +10:00
Madeline
4a48a7bcb8 Merge branch 'fix/sendMemberInProfile' into slowcord 2022-07-16 22:36:21 +10:00
Madeline
6a032c74c8 Actually respect with_mutual_guilds 2022-07-16 22:36:05 +10:00
Madeline
884aaaae37 Merge branch 'fix/sendMemberInProfile' into slowcord 2022-07-16 22:34:43 +10:00
Madeline
c5c00a0b87 Don't send @everyone role 2022-07-16 22:34:03 +10:00
Madeline
9dc2c706f7 Merge branch 'fix/sendMemberInProfile' into slowcord 2022-07-16 22:29:11 +10:00
Madeline
ad6ffd3aee Forgot to send roles in guild_member 2022-07-16 22:28:37 +10:00
Madeline
3c7a4cca51 Forgot to send roles in guild_member 2022-07-16 22:27:03 +10:00
Madeline
16ffe2d77a Merge branch 'fix/sendMemberInProfile' into slowcord 2022-07-16 22:23:23 +10:00
Madeline
53aeaab6b7 Respect with_mutual_guilds and guild_id in /users/:id/profile 2022-07-16 22:22:48 +10:00
Madeline
072f6ab862 Display offline members in member list (#788)
* Send offline member group in LazyRequest

* Better implementation of offline member group in lazy request
2022-07-16 18:35:44 +10:00
Erkin Alp Güney
8e7d9906d2 Revert "Send offline group in LazyRequest (#778)" (#787)
This reverts commit af41c942ca.
2022-07-16 11:23:09 +03:00
Madeline
af41c942ca Send offline group in LazyRequest (#778)
* Send offline member group in LazyRequest

* Better implementation of offline member group in lazy request

* Always display roles separately to online members
2022-07-16 11:06:43 +03:00
Madeline
7ff4acae73 Merge branch 'feat/offlineMembers' into slowcord 2022-07-16 13:42:19 +10:00
Madeline
296c570ecb Always display roles separately to online members 2022-07-16 13:42:03 +10:00
Madeline
1f1d1ee3d4 Merge branch 'feat/offlineMembers' into slowcord 2022-07-16 13:35:35 +10:00
Madeline
3fb2d15a29 Always display roles separately to online members 2022-07-16 13:35:18 +10:00
Madeline
cfa984a4f9 Set util to use same typeorm as bundle 2022-07-14 21:05:29 +10:00
Madeline
a620b3a31a Merge branch 'maddyrtc' into slowcord 2022-07-14 20:54:43 +10:00
Madeline
c78924ea67 dumb typing stuff 2022-07-14 20:54:24 +10:00
Madeline
dbe96d32f2 Remove a console log from the maddyrtc branch 2022-07-13 20:34:02 +10:00
Madeline
e314eb7604 /channel/:id/messages/:id/ack responds with { token: null } on discord.com 2022-07-13 20:30:13 +10:00
Madeline
71d22a193b Merge branch 'maddyrtc' into slowcord 2022-07-11 19:14:05 +10:00
Madeline
3e47da130c Change bundle start to only start listening once DB and config have been loaded 2022-07-10 22:14:18 +10:00
Madeline
3f59a5b529 Check if role icon was actually sent or if it's just an empty string 2022-07-10 22:06:26 +10:00
Madeline
19c7dfacc5 Merge branch 'feat/mobile' into slowcord 2022-07-10 22:01:13 +10:00