Commit Graph

30 Commits

Author SHA1 Message Date
819c6597f4 added translations 2023-05-18 18:23:26 +03:00
47a8b890da added translations 2023-05-15 17:52:57 +03:00
dbe48a260d added translations 2023-05-12 18:18:10 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
db7dffe624 refactoring 2022-11-24 17:22:34 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
ffe0fbde97 Cors: fix 2022-11-21 12:44:28 +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
9dfcd25033 backend: update dependency dll 2022-11-14 14:11:10 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
f034f1279f fixed AppName 2022-11-09 14:31:22 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
d05071110d Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
9faa6a947a Files: refactor 2022-09-19 11:50:31 +03:00
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
40702707bd refactoring 2022-09-14 14:21:25 +03:00
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
8ea04bcc81 Merge branch 'develop' into feature/12.0
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
cbd73be90b moved from ddf515b8 2022-06-08 12:02:40 +03:00
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +03:00