Commit Graph

1196 Commits

Author SHA1 Message Date
697b03ab6f Files: fixed @share 2020-02-27 18:25:59 +03:00
4e0fef6c95 Files: Fixed product path 2020-02-27 13:46:16 +03:00
3ac06f934d Files: fix 2020-02-27 11:51:05 +03:00
9a1a118f79 Merge branch 'master' into feature/elastic 2020-02-27 11:24:14 +03:00
190341c716 Files: renamed filescontroller 2020-02-27 11:22:42 +03:00
cae7c0f8c1 Web: People: fixed translation files 2020-02-27 11:12:11 +03:00
00e5f0c9cf Web: People: added truncate prop to checkbox, added border to users list container 2020-02-26 16:18:55 +03:00
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
c1c8bab59d Files: api 2020-02-26 13:01:12 +03:00
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06:55 +03:00
a78dad4064 web: files: Fixed proxy configure for images and socketjs 2020-02-26 11:04:26 +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
31dc839d22 web: Files: Fixed load Files home page 2020-02-25 14:47:50 +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
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
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
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
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
c0cc5cc188 Web: People: dialog message translations fixed 2020-02-21 11:57:47 +03:00
356e1d48ec Web: People: fixed send email header 2020-02-21 11:33:55 +03:00
a9f64e474f Merge branch 'master' into feature/user-actions-changes 2020-02-21 10:20:16 +03:00
28e94c16fc Web: People: fixed closing group button menu 2020-02-21 10:18:20 +03:00
7429478e2c Web: People: added new translations 2020-02-21 09:08:53 +03:00
41b943062a Web: People: removed unused translations 2020-02-21 09:06:58 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
c05fd0bfe7 Web: People: fixed change user type error 2020-02-20 16:14:33 +03:00
dd6ac76105 Web: People: added new translations 2020-02-20 16:05:36 +03:00
a1efaa4c17 Web: People: added change user type dialog 2020-02-20 15:55:25 +03:00
43bdd40f46 Web: People: removed unused getSelectionIds function, fixed getUserType function 2020-02-20 15:50:33 +03:00
c9689bc7df Web: People: rename DeleteGroupUsersShowUsers to ShowUsersList 2020-02-20 15:49:22 +03:00