Commit Graph

5188 Commits

Author SHA1 Message Date
888d735790 Web: People: fixed user list styles 2020-02-26 15:35:12 +03:00
d33895d8d5 Web: People: added custom scroll to list users 2020-02-26 15:26:54 +03:00
dcff29c806 File: FileStorageService renamed 2020-02-26 14:52:55 +03:00
1b4198b36d Files: ProductEntryPoint 2020-02-26 14:34:27 +03:00
b0bb74d7ee removed product 2020-02-26 13:02:26 +03:00
c1c8bab59d Files: api 2020-02-26 13:01:12 +03:00
b526b61bdd Update yarn.lock files 2020-02-26 13:01:04 +03:00
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06:55 +03:00
e57e8ff935 web: files: Replaced fake product 2020-02-26 11:06:44 +03:00
a78dad4064 web: files: Fixed proxy configure for images and socketjs 2020-02-26 11:04:26 +03:00
9800bfed8e web: files: Added onlyoffice-files.conf 2020-02-26 11:03:13 +03:00
044147baa4 web: files: Added nav.log svgs 2020-02-26 11:02:55 +03:00
1bc8f58df4 Merge branch 'master' into feature/user-actions-changes 2020-02-26 10:55:17 +03:00
ac5017da99 Merge branch 'master' into feature/elastic
# Conflicts:
#	build/build.bat
#	build/rebuild.bat
2020-02-26 10:46:37 +03:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
30dbb2a6ca Web: People: added send email function 2020-02-25 16:58:34 +03:00
935772d783 Web: People: renamed DeleteGroupUsersDialog to DeleteUsersDialog 2020-02-25 16:20:48 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
67e7f536d1 ASC.ApiSystem: fixed auth header parsing 2020-02-25 15:06:16 +03:00
d44e359f24 ASC.ApiSystem: fixed using 2020-02-25 14:48:14 +03:00
31dc839d22 web: Files: Fixed load Files home page 2020-02-25 14:47:50 +03:00
39128a7ba0 ASC.ApiSystem: replace AuthSignatureAttribute with AuthHandler 2020-02-25 14:43:01 +03:00
48513d7356 Web: People: renamed an array of users 2020-02-25 14:20:35 +03:00
fa4a088692 Web: People: fixed onChange checkbox function 2020-02-25 14:18:28 +03:00
b5bc446cc3 Merge branch 'master' into feature/user-actions-changes 2020-02-25 13:16:02 +03:00
e476681495 Web: People: added display of all users in the list in DeleteGroupUsersDialog, fixed display of the list of users 2020-02-25 13:14:44 +03:00
28d932afff ASC.ApiSystem: added appsettings.services.json 2020-02-25 12:05:27 +03:00
d9522e48ef Web: People: added display of all users in the list in ChangeUserStatusDialog, fixed display of the list of users 2020-02-25 11:58:04 +03:00
ce312b16c1 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-25 11:56:50 +03:00
af40cd8ca7 web: files: Fixed TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received type undefined 2020-02-25 11:56:41 +03:00
449c0db1fa ASC.ApiSystem: replace HttpResponseMessage to IActionResult 2020-02-25 11:45:16 +03:00
8737369a1c Web: People: added display of all users in the list in ChangeUserTypeDialog, fixed display of the list of users 2020-02-25 11:35:34 +03:00
ee31bb29b5 Web: People: fixed dialog class names 2020-02-25 11:32:17 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
c02a987d36 web: files: Fixed PUBLIC_URL 2020-02-25 11:13:39 +03:00
7942dbadf8 web: files: Added Module images 2020-02-25 11:13:08 +03:00
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
707e0bbf82 Web: People: added display of all users in the list in SendInviteDialog, fixed display of the list of users 2020-02-25 10:51:27 +03:00
af7ac989a6 Web: People: modified sending users to dialogs 2020-02-25 10:47:40 +03:00
a452774b8b Web: People: added getUsersIds selector 2020-02-25 10:44:08 +03:00
4ca24f0077 Files: Init Files.Client 2020-02-25 09:58:09 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
30d952b946 fix 2020-02-21 15:38:04 +03:00
7fce0d5de6 EF: GetKeys - is now public 2020-02-21 14:23:56 +03:00
Daniil Senkiv
1ae795a86b web: common: bump version 2020-02-21 14:14:13 +03:00
Daniil Senkiv
b724548e98 web.common: fix working web.client, if api people not available 2020-02-21 14:13:45 +03:00
Daniil Senkiv
a1d249be68 web.common: fix problem with handling idle modules 2020-02-21 14:11:33 +03:00
8b29a20411 EF: AddOrUpdate now return entity 2020-02-21 12:58:40 +03:00
46cfe9f382 ASC.ApiSystem: AuthSignatureService: using IConfiguration 2020-02-21 12:45:59 +03:00