Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2026-07-27 02:15:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix merge conflicts

Browse Source
This commit is contained in:
ephraimduncan
2025-12-29 20:02:51 +00:00
parent 7a499270be 1e20561e91
commit 3976531045
165 changed files with 6291 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/prisma/schema.prisma
+6 -4
View File
@@ -819,6 +819,7 @@ model OrganisationGlobalSettings {
includeAuditLog Boolean @default(false)
documentTimezone String? // Nullable to allow using local timezones if not set.
documentDateFormat String @default("yyyy-MM-dd hh:mm a")
delegateDocumentOwnership Boolean @default(false)
typedSignatureEnabled Boolean @default(true)
uploadSignatureEnabled Boolean @default(true)
@@ -845,10 +846,11 @@ model TeamGlobalSettings {
id String @id
team Team?
documentVisibility DocumentVisibility?
documentLanguage String?
documentTimezone String?
documentDateFormat String?
documentVisibility DocumentVisibility?
documentLanguage String?
documentTimezone String?
documentDateFormat String?
delegateDocumentOwnership Boolean?
includeSenderDetails Boolean?
includeSigningCertificate Boolean?