Commit Graph

1010 Commits

Author SHA1 Message Date
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
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
db951d00e6 asc.apicache 2022-12-16 15:41:09 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
143a4d01ec removed unused variables 2022-12-09 17:47:46 +03:00
153c68b3bd Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 13:05:08 +03:00
ddd791096d Feed.Aggregator: changed socket client resolving 2022-12-09 12:38:02 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
2ca007eb81 ApiSystem: cors 2022-12-07 12:34:14 +03:00
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +03:00
130532927b Merge branch 'develop' into feature/socket-newtag 2022-11-24 17:56:32 +03:00
db7dffe624 refactoring 2022-11-24 17:22:34 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
ee04a7a55c removed unused dependencies 2022-11-24 14:40:13 +03:00
2f7fdaf00a
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
2022-11-16 18:24:29 +03:00
0fb1e343a5 fix 2022-11-16 11:34:21 +03:00
e17ef78c00 fix 2022-11-15 14:22:53 +03:00
56ad3d2287 fix 2022-11-15 13:53:53 +03:00
61b401d906 fix 2022-11-15 13:28:25 +03:00
dd1fa60145 Merge branch 'develop' into feature/socket-newtag 2022-11-14 18:29:46 +03:00
9dfcd25033 backend: update dependency dll 2022-11-14 14:11:10 +03:00