Nikita
54341cb203
fixed input and output parameters in Api(LdapController)
2022-05-26 17:39:02 +03:00
Nikita
3e663061da
added activeDirectory to slnf
2022-05-24 13:15:44 +03:00
Nikita
1d2521c399
fix
2022-05-24 12:59:04 +03:00
Nikita
55a702bd2a
fix
2022-05-23 23:44:45 +03:00
Nikita
a7b9b77613
fix
2022-05-23 16:38:05 +03:00
Nikita
bb23b167a0
fix
2022-05-18 14:32:42 +03:00
Nikita
b1ad63cdac
fix
2022-05-18 13:54:13 +03:00
Nikita
77e435ede3
fix
2022-05-18 13:50:39 +03:00
Nikita
b76b97af89
Merge branch 'develop' into feature/LDAP-new
2022-05-18 13:38:00 +03:00
Nikita
6451ac6329
fix
2022-05-18 13:36:35 +03:00
9ed3b1cb2f
fix tests
2022-05-16 13:58:45 +03:00
4840b42277
Merge pull request #640 from ONLYOFFICE/feature/fix-tests
...
Feature/fix tests
2022-05-16 12:57:25 +03:00
f4727b411e
Test: fix
2022-05-13 18:08:30 +03:00
14f25c2da7
Test: fix
2022-05-13 14:48:51 +03:00
969c037d3c
Merge branch 'develop' into feature/fix-tests
2022-05-13 12:27:30 +03:00
Nikita
787a1ba172
fix
2022-05-13 12:20:28 +03:00
08e926ca0e
Merge pull request #625 from ONLYOFFICE/feature/SSO-new
...
Feature/sso-new
2022-05-13 11:54:06 +03:00
411e3b7f58
Sso: fix
2022-05-13 11:52:49 +03:00
87a7a1089c
Merge branch 'develop' into feature/SSO-new
2022-05-12 19:37:24 +03:00
Eugene Kozyrev
4929c5f343
Upgrade ZooKeeper version to 3.7.1 in Windows installation ( #637 )
...
* Upgrade ZooKeeper version to 3.7.1
* Add versions variables
2022-05-12 19:06:09 +03:00
Vashchuk Nikita
11ac66a1e0
refactoring
2022-05-05 16:23:05 +03:00
Vashchuk Nikita
44cf5d7f80
fix
2022-04-29 18:25:49 +03:00
84121f4451
fix
2022-04-29 17:26:21 +03:00
cf0e9c322d
ElasticSearch: fix
2022-04-29 16:17:52 +03:00
Vashchuk Nikita
fd472da6bc
added JsonPropertyName
2022-04-29 14:56:40 +03:00
31c289a26b
fix-tests: change dir for log and products
2022-04-29 13:48:29 +03:00
Vashchuk Nikita
b8ed834eba
fix
2022-04-29 10:49:56 +03:00
4a773679e1
fix-tests: rework files tests
...
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
Vashchuk Nikita
f39a476d06
added SsoController, fix
2022-04-28 16:56:12 +03:00
Vashchuk Nikita
442a6bb30a
Merge branch 'develop' into feature/SSO-new
...
# Conflicts:
# config/nginx/onlyoffice.conf
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Studio/Startup.cs
2022-04-28 15:45:11 +03:00
Vashchuk Nikita
4cab782bc8
Merge branch 'develop' into feature/LDAP-new
...
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Program.cs
# web/ASC.Web.Api/Startup.cs
2022-04-28 09:41:09 +03:00
e11fc2ff79
backend: updated packages version
2022-04-27 18:48:28 +03:00
36d914724d
backend: updated packages version
2022-04-27 17:54:31 +03:00
93f637467b
backend: updated packages version
2022-04-27 14:26:38 +03:00
19cf415898
backend: updated packages version
2022-04-27 13:02:17 +03:00
Vashchuk Nikita
a4e9cae742
changed work with disturbedTask
2022-04-26 17:03:41 +03:00
Vashchuk Nikita
258cf02d27
fix ssoHandler
2022-04-26 14:10:12 +03:00
Vashchuk Nikita
1431c5ec80
fix
2022-04-26 12:27:12 +03:00
Vashchuk Nikita
e812d3ec53
fix
2022-04-26 11:49:55 +03:00
Vashchuk Nikita
62c66e6e1f
Merge branch 'feature/SSO-new' of github.com:ONLYOFFICE/AppServer into feature/SSO-new
2022-04-25 21:42:36 +03:00
Vashchuk Nikita
422e87af13
added ssoHandler
2022-04-25 21:41:26 +03:00
dc939846c4
Merge pull request #632 from ONLYOFFICE/feature/backend-refactor
...
Feature/backend refactor
2022-04-25 16:03:27 +04:00
2a5aa715e4
fix tests
2022-04-25 11:09:51 +03:00
88b59b1c30
refactoring
2022-04-22 16:24:54 +03:00
9eba173a44
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2022-04-21 22:36:29 +03:00
6c9a9f7a8a
Merge pull request #628 from ONLYOFFICE/feature/virtual-rooms-1.2
...
Feature/virtual rooms 1.2
2022-04-21 12:09:30 -04:00
073ee2dc36
Merge branch 'develop' into feature/virtual-rooms-1.2
2022-04-21 12:07:18 -04:00
750b49fd8c
Merge pull request #624 from ONLYOFFICE/feature/interface-theme
...
Feature/interface theme
2022-04-21 12:05:10 -04:00
60d728695c
fix slnf
2022-04-21 18:56:04 +03:00
05609787f2
Files: fix async
2022-04-21 18:55:49 +03:00
