Commit Graph

1032 Commits

Author SHA1 Message Date
cad10c140b Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 19:16:26 +03:00
3aaaf4eafe AuditTrail: added new actions 2023-03-13 18:55:44 +03:00
32e3769176 Search: exception handling 2023-03-13 14:51:32 +03:00
47e14d50fb async/await: added new instance dbcontext 2023-03-10 19:49:46 +03:00
132bc6792b
Merge pull request #1297 from ONLYOFFICE/feature/notifications
Feature/notifications
2023-03-10 17:06:55 +03:00
722df36493 async: fixed 2023-03-10 16:09:32 +03:00
Vashchuk Nikita
2d92da7c0c Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
#	web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
05571943dc backend: refactoring. replace sync methods to async within ExecutionStrategy block 2023-03-09 14:42:18 +03:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
Vashchuk Nikita
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
27900054a0
Merge pull request #1242 from ONLYOFFICE/feature/ef-batch
EF: batch operations
2023-02-28 15:48:05 +03:00
78a2e20edb refactoring 2023-02-27 18:38:01 +03:00
beb1834a0a EF: batch operations 2023-02-27 16:39:52 +03:00
ead94f371e Merge branch 'develop' into feature/notifications 2023-02-27 10:29:50 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
216a6480c8 Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/common/constants/index.js
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	yarn.lock
2023-02-22 15:50:55 +03: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
afe82d599d ASC.Webhooks.Service moved to ASC.Web.Studio 2023-02-08 20:31:58 +03:00
d49ee80fd8 Merge branch 'develop' into feature/fix-webhooks-second 2023-02-08 13:18:59 +03:00
5e76441b64 fix 2023-02-07 19:12:09 +03:00
f52f32a6af Merge branch 'develop' into feature/asc.apicache
# Conflicts:
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
610b2f7660 AuditTrail: added new audit message patterns 2023-02-02 13:28:31 +03:00
5aebd35844 AuditTrail: added room link update action 2023-02-02 13:25:18 +03:00
e116b85281 AuditTrail: added room unarchived action message 2023-02-02 11:51:22 +03:00
a48b77170f AuditTrail: added rooms action mapper 2023-02-02 11:33:20 +03:00
6d625aece4 AuditTrail: added entry types for room and custom tag 2023-02-02 11:32:51 +03:00
d2b5ea72a5 AuditTrail: added module type for room 2023-02-02 11:30:27 +03:00
Vashchuk Nikita
d8b9fada67 added functionality for disable SSL verification on WebhookSender requests 2023-01-31 00:25:51 +05:00
Vashchuk Nikita
29626ce3a8 hex format and renaming for secret 2023-01-30 21:32:46 +05:00
Vashchuk Nikita
cf37c1704d remove name from returned parameters 2023-01-30 21:31:31 +05:00
7ba557cd65 remove unused api methods 2023-01-30 11:00:00 +03:00
05b8f4ea81 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-25 10:37:37 +03:00
8a8143950d replace CreateScope() => CreateScopeAsync() 2023-01-24 20:33:27 +03:00
255b54b169 Added allow anonymous attribute. 2023-01-24 17:08:55 +03:00
406ee9f2f9 Notify: removed schedulers. Fixed send 2023-01-19 23:13:29 +03:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
2023-01-19 22:00:57 +03:00
f762b44dbe update external dll 2023-01-19 19:10:38 +03:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
9937ecccee fix 2023-01-19 18:32:37 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
bff2128b5f Resources renamed 2023-01-18 18:53:09 +03:00
031d54aa30 fix: remove waste in startup 2022-12-26 10:32:36 +03:00
ceebd5b47d refactoring 2022-12-22 18:48:05 +03:00
9ed6dff1be remove waste 2022-12-22 18:17:10 +03:00
62cec7b7c5 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-22 14:17:24 +03:00
724345a2b7 fixed validate link restore password 2022-12-21 20:12:43 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
045d61c0bf add bat for asc.apicache 2022-12-20 13:04:21 +03:00
d31e341ff9 add async and AddBaseDbContext with settings 2022-12-20 10:27:55 +03:00
0b6ba47863 refactoring 2022-12-16 15:56:03 +03:00