Commit Graph

159 Commits

Author SHA1 Message Date
f20eb2429c edited Note in pattern_portal_rename 2023-05-03 12:01:40 +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
6d13c4bc32 added translations 2023-04-26 18:20:27 +03:00
09b5f612c9 added translations 2023-04-26 12:23:34 +03:00
d46661eb85 edited translations 2023-04-24 13:46:53 +03:00
d25e10bf2c added translations 2023-04-21 23:34:13 +03:00
d34663eb9f fixed quota description 2023-04-21 21:03:40 +03:00
d1d2d2f87c fixed admin activation message 2023-04-21 18:04:04 +03:00
69e5f40bc8 added translations 2023-04-21 17:21:38 +03:00
f0a6679ba8 added translations 2023-04-21 15:19:59 +03:00
3639f97217 fixed warnings 2023-04-18 16:49:42 +03:00
cbe2e24efe edited lang-s indexes 2023-04-18 15:10:44 +03:00
78e6688211 added translations 2023-04-18 14:30:55 +03:00
e6c2f39e39 fix translations 2023-04-18 09:58:41 +03:00
3b4c396391 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-17 18:26:09 +03:00
03acba483c added translations 2023-04-17 18:25:51 +03:00
265a27a320 fixed notify pattern resource 2023-04-17 17:40:44 +03:00
95ca8e7811 added bg 2023-04-17 15:19:46 +03:00
7ba38a4a4e Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-17 14:18:44 +03:00
177c79fc79 added az 2023-04-17 14:18:22 +03:00
61011b759d fix Bug 62120 2023-04-17 12:27:56 +03:00
NikitaVashchuk
9340e0432f fixed invite notification format 2023-04-10 16:23:09 +05:00
6780c7da49 translations 2023-04-06 21:32:15 +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
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
Vashchuk Nikita
a9284faf1d added logo.png as embedded resource 2023-03-23 21:33:33 +05: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
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