|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4432bf7d22
|
Socket: async, refactoring
Files: markasnew
|
2022-11-13 20:33:19 +03:00 |
|
|
|
aa0222f078
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-11 15:05:26 +03:00 |
|
|
|
e0ee5562e5
|
fix SendCongratulations
|
2022-11-11 11:53:11 +03:00 |
|
|
|
2314dce176
|
fix apisystem
|
2022-11-10 18:07:11 +03:00 |
|
|
|
6537a2c7e6
|
add logs
|
2022-11-10 14:04:58 +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 |
|
|
|
24829b5d9e
|
Audit: fix
|
2022-11-08 13:38:33 +03:00 |
|
|
|
2ae75ec762
|
fix ide001
|
2022-11-07 12:49:29 +03:00 |
|
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +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 |
|
|
|
30fa1816f6
|
add logs
|
2022-11-03 13:27:41 +03:00 |
|
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
|
793daf52d3
|
delete cultureMiddleware from api system
|
2022-10-31 17:26:07 +03:00 |
|
|
|
52b23cbf8b
|
healthcheck: added to ApiSystem/ClearEvents services. refactoring
|
2022-10-31 16:13:45 +03:00 |
|
|
|
8712696b0b
|
fix
|
2022-10-28 12:47:41 +03:00 |
|
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
|
ee3714795e
|
fix
|
2022-10-27 14:18:39 +03:00 |
|
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
|
fe5385053c
|
rebbitmq: split default queue on separate queue
|
2022-10-26 17:21:37 +03:00 |
|
|
|
277ca1c2cb
|
fixed field number generator
|
2022-10-25 16:08:23 +03:00 |
|
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
|
a1ff4230a7
|
fix merge
|
2022-10-19 14:30:14 +03:00 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
16bb42d0af
|
fix ASC.Data.Storage.Encryption
|
2022-10-19 13:12:33 +03:00 |
|
|
|
502aac91b1
|
ApiSystem: log, service
|
2022-10-17 18:24:50 +03:00 |
|
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
|
19ad5b0ef2
|
fix api system
|
2022-10-17 12:15:44 +03:00 |
|
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
