IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97a2cd9851
DocSpace-client/web/ASC.Web.Core/Notify
History
Sergey Linnik b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
2023-08-01 17:07:05 +03:00
..
Actions.cs guest welcome letter changed (Bug 60658) 2023-03-24 14:14:17 +03:00
BadgesSettings.cs fix merge 2023-04-06 17:24:14 +03:00
NotificationControllerHelper.cs Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
NotifyConfiguration.cs removed .result 2023-05-31 10:42:09 +03:00
RoomsNotificationSettings.cs fix merge 2023-04-06 17:24:14 +03:00
SpamEmailSettings.cs
StudioNotifyHelper.cs Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
StudioNotifyService.cs fix 2023-07-24 11:59:20 +03:00
StudioNotifyServiceHelper.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
StudioNotifyServiceSender.cs remove wait 2023-05-24 10:15:16 +03:00
StudioNotifySource.cs Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
StudioPeriodicNotify.cs Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
StudioSubscriptionManager.cs
StudioWhatsNewNotify.cs Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
Tags.cs payment emails added 2023-03-19 12:25:31 +03:00
TagValues.cs fixed greenbutton text 2023-04-21 18:45:09 +03:00