Commit Graph

253 Commits

Author SHA1 Message Date
42e8b739f3 fix Bug 61992 2023-04-11 17:52:39 +03:00
7504e20f63
Merge pull request #1316 from ONLYOFFICE/feature/notification-fixes
Feature/notification fixes
2023-03-24 14:41:20 +03:00
240d60c8b6 guest welcome letter changed (Bug 60658) 2023-03-24 14:14:17 +03:00
Vashchuk Nikita
ca6e1d1553 returned old images 2023-03-23 02:26:07 +05:00
Vashchuk Nikita
2b94d5dfa5 changed notification image format to png,
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
2023-03-23 00:25:15 +05:00
c547e4af1a fixed the path to the payment page 2023-03-20 11:54:19 +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
f3f1cd1adc fix userName, added collaborator as portals Role resource 2023-03-09 20:57:21 +05:00
Vashchuk Nikita
8bbdeffa46 changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName 2023-03-09 16:40:36 +05:00
Vashchuk Nikita
4d95d7c848 added roomRemoved as instant action 2023-03-07 19:37:04 +05:00
Vashchuk Nikita
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
Vashchuk Nikita
f5918e9772 fix roomsNotificationSettings after merge with develop 2023-02-27 12:40:46 +05:00
Vashchuk Nikita
9e0a5e91cb fix letter format, mute attribute, tags counter 2023-02-21 14:19:26 +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
Vashchuk Nikita
b928966550 added settings for configure RoomsNotification, added mute field for files and folders 2023-02-06 16:15:51 +05:00
Vashchuk Nikita
f6ca8e3c78 added methods for configuring notifications 2023-01-26 19:12:12 +05:00
0cf90e45be Poeple: simplified time cutting 2022-12-14 10:10:46 +03:00
6c75f8be0f Web.Core: added rounding to seconds 2022-12-13 16:06:06 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +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
c3e32fac2f WhiteLabel: fix async 2022-11-23 17:23:46 +03:00
4b180094e8 Whitelabel: rename 2022-11-22 18:03:59 +03:00
d733880485 dark whitelabel 2022-11-09 16:30:56 +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
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00
edf9fb3111 Web.Core: added DocSpace email notify 2022-10-26 17:40:18 +03:00
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +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
7af080486c Merge branch 'develop' into feature/rights-rework 2022-10-18 14:32:17 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
16af78a2a2 fix is default 2022-10-14 23:59:18 +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
c13d306b2b deleted table 2022-10-13 17:46:28 +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
a81976b845 fix 2022-10-13 16:22:08 +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