Commit Graph

4998 Commits

Author SHA1 Message Date
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
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
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
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +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
ed8f6ebc32 Web: Components: removed the click close function in the title, fixed tests 2020-02-21 10:10:32 +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
28529368b6 Merge branch 'master' into feature/user-actions-changes 2020-02-20 14:15:18 +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
1caab63fbc HostedSolution: DI 2020-02-20 11:16:58 +03:00
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +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
7436fd8548 web: common: bump version 2020-02-18 14:16:22 +03:00
c248db6cf8 Web: Common: fixed profile avatar size 2020-02-18 14:16:03 +03:00
c7b5d75692 web: common: bump version 2020-02-18 13:16:16 +03:00
fa1bde3742 Web: People: change title of pages, added new translations 2020-02-18 13:16:01 +03:00
f3731820cb Web: Client: change title of pages, added new translations 2020-02-18 13:15:02 +03:00
259cb20de3 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2020-02-18 13:11:27 +03:00
76b9f99623 Web: Common: change title of login page, added new translations 2020-02-18 13:11:16 +03:00
Ilya Oleshko
b11717e23b web: components: bump version 2020-02-18 12:06:41 +03:00