Commit Graph

1138 Commits

Author SHA1 Message Date
dependabot[bot]
3e25e5c6de
Bump acorn from 5.7.3 to 5.7.4 in /products/ASC.People/Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:54:24 +00:00
9a1a118f79 Merge branch 'master' into feature/elastic 2020-02-27 11:24:14 +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
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06: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
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
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
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
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
65fa34dff4 Web: People: added change user status dialog 2020-02-20 14:13:54 +03:00
6c7145f32e Web: People: removed set disabled dialog 2020-02-20 14:12:42 +03:00
f2dd97824d Web: People: added new disable users dialog 2020-02-20 11:24:53 +03:00
e0e7803e56 Web: People: fixed users dialogs 2020-02-20 11:23:27 +03:00
f135a022d3 Web: People: fixed selectors functions 2020-02-20 11:22:23 +03:00
9ef838e8fc Web: People: refactoring delete group users dialog 2020-02-20 09:28:58 +03:00
7ada48f0bc Web: People: added send invite dialog to group users 2020-02-20 09:26:51 +03:00
05954f21e0 Web: People: added new translations to resourceConfig 2020-02-19 16:09:54 +03:00
a8eb7d8b1b Web: People: added delete group users warning dialog 2020-02-19 16:08:57 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
68e1a6a6a0 Web: People: added disabling action fields in the group buttons menu 2020-02-19 10:32:51 +03:00
fa1bde3742 Web: People: change title of pages, added new translations 2020-02-18 13:16:01 +03:00
Ilya Oleshko
b68ea6335c People.Client: Home: Fixed width for Row sub components 2020-02-18 12:06:18 +03:00
39db07a4a8 Web: People: fixed clickability of a link to groups in a tree 2020-02-17 17:29:24 +03:00