e0f82c1a86
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
2023-05-16 11:25:26 +03:00
6efa64b91b
remove unused resources
2023-05-12 22:48:47 +03:00
dbe48a260d
added translations
2023-05-12 18:18:10 +03:00
NikitaVashchuk
4888973e73
fix bug 62456
2023-05-05 22:09:17 +05:00
NikitaVashchuk
b613e66cb7
Merge branch 'hotfix/v1.0.1' into bugfix/62369
...
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx
2023-05-04 19:24:15 +05:00
0f0128e4d0
Merge pull request #1394 from ONLYOFFICE/bugfix/notifications
...
Bugfix/notifications
2023-05-04 17:02:55 +03:00
e3dfc1cd0a
edited pattern_portal_rename
2023-05-02 16:22:38 +03:00
2fb3c9f975
added translations
2023-04-28 16:24:46 +03:00
8687b3ae99
edited translations
2023-04-27 17:42:34 +03:00
NikitaVashchuk
30f001a4c0
fix periodic and welcome notifications
2023-04-26 20:47:06 +05:00
d1d2d2f87c
fixed admin activation message
2023-04-21 18:04:04 +03:00
NikitaVashchuk
9340e0432f
fixed invite notification format
2023-04-10 16:23:09 +05:00
240d60c8b6
guest welcome letter changed (Bug 60658)
2023-03-24 14:14:17 +03:00
6bafdc2343
user welcome letter changed
2023-03-24 13:28:55 +03:00
1324f349a1
docs tips letter changed
2023-03-24 12:36:31 +03:00
9175233546
payment emails added
2023-03-19 12:25:31 +03:00
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
905fae583f
Web.Core: fix pattern
2022-12-13 17:55:12 +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
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
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
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
36714b4130
Api: added payment/request
2022-09-04 18:30:32 +03:00
a5f4435b17
fix notify
2022-07-20 22:06:33 +03:00
74d238bde8
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
2022-06-30 16:13:31 +03:00
6d98440200
az resources
2022-06-27 14:00:23 +03:00
2d9bd5943d
fix Bug 57661
2022-06-21 18:13:21 +03:00
e68ac70005
Merge branch 'develop' into feature/docspace
2022-06-20 12:15:08 +03:00
e2cee2c2fc
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
fc93c6336a
Files: added email invitation
2022-06-16 18:34:38 +03:00
c9fb0d3dac
moved from ddf515b8
2022-06-16 11:13:53 +03:00
35bebe49f9
moved from ddf515b8
2022-06-14 11:11:41 +03:00
300bcf2247
Core: Notify. Resource.
2022-05-12 15:52:37 +03:00
