Ryan/docmost-ryan
1
0
Fork 0
mirror of https://github.com/Shadowfita/docmost.git synced 2025-11-17 02:01:03 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into Merged-Downstream

Browse Source 
# Conflicts:
#	apps/client/src/features/auth/hooks/use-auth.ts
#	apps/client/src/features/editor/extensions/extensions.ts
This commit is contained in:
Ryan Palmer
2024-10-01 12:43:22 +10:00
parent 8eb5eb3161 d69fff5ef7
commit 2102595f8a
56 changed files with 1093 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/server/src/integrations/environment/environment.service.ts
View File

@ -62,9 +62,9 @@ export class EnvironmentService {
getAwsS3Endpoint(): string {
return this.configService.get<string>('AWS_S3_ENDPOINT');
}
getAwsS3ForcePathStyle(): boolean {
return this.configService.get<boolean>('AWS_S3_FORCE_PATH_STYLE')
return this.configService.get<boolean>('AWS_S3_FORCE_PATH_STYLE');
}
getAwsS3Url(): string {