Vashchuk Nikita
473cecc4db
cleaning up resources, refactoring
2023-03-10 16:16:58 +05:00
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
fccdbed5a8
fix 60659
2023-01-19 18:20:50 +03:00
bff2128b5f
Resources renamed
2023-01-18 18:53:09 +03:00
846aa53583
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
2022-12-26 12:19:54 +03:00
1ae54147ce
Files: added warning message, added demotion on invitation
2022-12-26 12:19:37 +03:00
0d4000df46
fixed warning
2022-12-25 20:11:06 +03:00
905fae583f
Web.Core: fix pattern
2022-12-13 17:55:12 +03:00
426a11d080
Merge branch 'develop' into release/rc-v1.2.0
2022-12-12 19:33:41 +03:00
eee9c05d9a
ASC.Web.Core: Notify: fix email templates
2022-11-30 18:40:01 +03:00
1a565b559e
ASC.Web.Core: Notify: added missing email templates
2022-11-30 17:28:38 +03:00
Viktor Fomin
366d92abb2
Merge branch 'develop' into feature/fix-whitelable
2022-11-28 12:09:11 +03:00
3ef3ffb617
fixed telegram resources
2022-11-25 20:37:48 +03:00
35e22fe8c8
Merge branch 'develop' into feature/fix-whitelable
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-11-18 16:48:19 +03:00
b379931d1f
fix whitelabel
2022-11-15 14:11:44 +03:00
14a64f4ad0
Merge branch 'develop' into feature/remove-waste
...
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
cec0473d1b
Merge branch 'develop' into feature/letters
...
# Conflicts:
# web/ASC.Web.Core/Notify/Actions.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
2022-11-02 13:25:49 +03:00
fa24e98df6
fix IpSecurityFilter
2022-10-28 10:58:13 +03:00
dbaf6bb264
remove unused resources
2022-10-27 16:15:08 +03:00
95a1743258
Revert "remove unused resources"
...
This reverts commit 2d99753676
2022-10-27 16:01:32 +03:00
edf9fb3111
Web.Core: added DocSpace email notify
2022-10-26 17:40:18 +03:00
ba01d9dacd
Merge remote-tracking branch 'remotes/origin/develop' into feature/letters
...
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
2022-10-20 13:56:13 +03:00
2927cdb66b
Notify: small fix
2022-10-20 13:50:08 +03:00
2d99753676
remove unused resources
2022-10-19 18:39:42 +03:00
diana-vahomskaya
c407a412b3
fix
2022-10-17 14:40:42 +03:00
diana-vahomskaya
ebed27f1c7
deleted PersonalAfterRegistration7, PersonalAfterRegistration14, PersonalAfterRegistration21, fix letters
2022-10-13 22:08:07 +03:00
diana-vahomskaya
6cb72eb490
deleted EnterpriseAdminInviteTeammatesV10, EnterpriseAdminWithoutActivityV10, EnterpriseAdminTrialWarningBefore7V10, EnterpriseAdminTrialWarningV10, EnterpriseAdminPaymentWarningBefore7V10, EnterpriseAdminPaymentWarningV10
2022-10-13 20:29:15 +03:00
diana-vahomskaya
2f646828e5
deleted EnterpriseAdminCustomizePortalV10, EnterpriseWhitelabelAdminCustomizePortalV10
2022-10-13 18:57:46 +03:00
diana-vahomskaya
39d66dfb7d
deleted SaasAdminTrialWarningAfter1V115
2022-10-13 17:33:29 +03:00
diana-vahomskaya
eb1a101aa0
deleted SaasAdminTrialWarningV115
2022-10-13 17:24:07 +03:00
diana-vahomskaya
3a40dee414
deleted SaasAdminTrialWarningBefore5V115
2022-10-13 17:20:27 +03:00
diana-vahomskaya
b1fc5019ee
deleted SaasAdminUserAppsTipsV115
2022-10-13 17:17:13 +03:00
diana-vahomskaya
e9e5393031
deleted SaasAdminPaymentWarningEvery2MonthsV115
2022-10-13 17:13:11 +03:00
diana-vahomskaya
36011a497b
deleted SaasAdminComfortTipsV115
2022-10-13 17:08:58 +03:00
diana-vahomskaya
46bc2fcdee
added letter saas_admin_modules_v1
2022-10-13 15:20:15 +03:00
diana-vahomskaya
a2f120e86a
fixed letters for DocSpace, added new text for footer: TextForFooterUnsubsribeDocSpace
2022-10-13 11:53:18 +03:00
dc2cfbc614
Merge branch 'develop' into feature/apisystem
...
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
2022-10-11 13:53:31 +03:00
4dbf1e70b7
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
400fc49bb6
api system
...
-fix api system
-TenantName from resources
2022-10-05 14:23:53 +03:00
c331dbffa0
web: PublicResources: Changed translations.
2022-10-05 10:53:41 +03:00
9c8bf9708a
Payment: UsersInRoomStatistic
2022-09-20 23:22:27 +03:00
ccbbc5499e
Quota: MaxFileSizeChecker
2022-09-19 22:49:41 +03:00
5848bf5cd3
Api: payments check
2022-09-19 17:56:45 +03:00
6b728a0fca
refactoring
2022-09-15 18:58:05 +03:00
90c3cd29ba
fix
2022-09-13 22:35:54 +03:00
7a17f325b1
Api: payments. Removed FeaturePriceDto
2022-09-13 19:59:57 +03:00
acbacaf9ef
Quota: removed MaxFileSize column
2022-09-09 15:13:54 +03:00
bf5ce9cdb0
Quota: admin replaced with manager
2022-09-08 16:35:52 +03:00
83f4545f02
Quota: refactoring
2022-09-08 10:23:26 +03:00
