Commit Graph

1139 Commits

Author SHA1 Message Date
35e2e20049 Files: added model 2020-02-25 15:21:48 +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
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +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
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
39db07a4a8 Web: People: fixed clickability of a link to groups in a tree 2020-02-17 17:29:24 +03:00
785f002c4d Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2020-02-17 16:50:49 +03:00
82380e35e9 Web: People: change title of pages 2020-02-17 16:50:19 +03:00
Ilya Oleshko
289c9e7807 People.Client: Home: Fixed context options array 2020-02-17 15:29:03 +03:00
31526c5e48 Web: People: fixed groups tree links 2020-02-17 13:43:13 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
2c024ca787 Web: People: fixed profile rerender after click on user 2020-02-17 11:08:46 +03:00
d9468384a6 Web: People: added links to users list 2020-02-17 09:50:00 +03:00
933bf17f4e Web: People: added links to groups in the tree 2020-02-17 08:55:23 +03:00
b550a776a9 Web: People: added logo icons 2020-02-14 16:05:12 +03:00
42171afc48 Web: People: fixed updated filter after selecting a group 2020-02-14 14:51:08 +03:00
c082019270 Files: DI 2020-02-14 13:45:46 +03:00
b48d80b2b3 Web: People: fixed datepicker disable prop 2020-02-14 12:47:07 +03:00
65b2d25520 Web: People: fixed profile menu blocks alignment 2020-02-14 11:46:37 +03:00
5791c1bcf5 Web: People: fixed profile text color and fields size 2020-02-14 11:26:29 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
c0cc00bfbe Files:DI 2020-02-13 15:19:25 +03:00
507cd94e98 Merge branch 'master' into feature/redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-02-13 11:09:37 +03:00
de4b4a0dde Files: DI 2020-02-12 18:21:58 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
00246f7f9f Files: Startup 2020-02-12 13:48:58 +03:00
0da5b85eb8 Files: DI, EF 2020-02-12 13:29:10 +03:00
43f662acd1 Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign 2020-02-12 13:07:45 +03:00
8298a77717 Web: Client: fixed tree icons 2020-02-12 13:03:23 +03:00
Ilya Oleshko
1d7bdb03b0 People.Client: Home: Fixed GroupButtonsMenu size with pined Aside on mobile 2020-02-12 11:40:56 +03:00
159bdc1a72 Merge branch 'master' into feature/redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-02-12 09:40:56 +03:00
816231d9e9 Files: DI 2020-02-11 18:15:39 +03:00
fdf5b27903 Files: DI 2020-02-11 18:10:30 +03:00
c900a319de Added update user list after remove disabled user 2020-02-11 15:28:18 +03:00
9fd33a1ef8 Files: DI 2020-02-11 15:10:06 +03:00
cc6b4db2f1 Files: DI 2020-02-11 14:51:45 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +03:00
3e61074a44 Files: DI 2020-02-11 12:39:32 +03:00
Ilya Oleshko
ebceb3b346 People.Client: Home: Fixed default DropDown direction for action button 2020-02-11 11:12:39 +03:00
2d73943b81 Files: DI 2020-02-10 19:04:54 +03:00
03af1cfac0 Files: DI 2020-02-10 16:46:01 +03:00
26b6ef0e2c Files: DI 2020-02-10 16:06:03 +03:00
b57007d28b Web: People: hidden tree icons 2020-02-10 15:49:50 +03:00
1e833b4ecd Web: People: fixed people group colors and font 2020-02-10 15:21:05 +03:00
607478a658 Files: DI 2020-02-08 21:44:55 +03:00
Daniil Senkiv
1b9700aa19 removed comment 2020-02-07 19:48:13 +03:00
e0fc7e6f39 Files: DI 2020-02-07 17:31:15 +03:00