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

Merge branch 'main' into Merged-Downstream

Browse Source 
# Conflicts:
#	apps/client/package.json
#	apps/client/src/features/editor/extensions/extensions.ts
#	apps/client/src/pages/auth/login.tsx
#	apps/server/package.json
#	apps/server/src/integrations/environment/environment.service.ts
#	packages/editor-ext/src/index.ts
#	pnpm-lock.yaml
This commit is contained in:
PALMER
2025-01-16 07:38:37 +10:00
parent 26cae77eb5 f11f23ae16
commit f9d87eaea0
224 changed files with 10495 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.env.example
View File

@ -33,6 +33,9 @@ AWS_S3_BUCKET=
AWS_S3_ENDPOINT=
AWS_S3_FORCE_PATH_STYLE=
# default: 50mb
FILE_UPLOAD_SIZE_LIMIT=
# options: smtp | postmark
MAIL_DRIVER=smtp
MAIL_FROM_ADDRESS=hello@example.com
@ -49,3 +52,5 @@ SMTP_IGNORETLS=false
# Postmark driver config
POSTMARK_TOKEN=
# for custom drawio server
DRAWIO_URL=