Alexey Safronov f07aa0a183 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # config/nginx/onlyoffice.conf # packages/asc-web-common/constants/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js		2022-02-25 16:05:43 +03:00
..
files	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
groups	Web: People/Common: added sorting of groups in the tree	2021-11-16 19:27:27 +03:00
modules	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
people	Fix displayName of current user after creation/update if user's display name with diacritics	2021-11-13 20:18:58 +03:00
portal	Web: Files: Backup: Added method to check if automatic backup is available, refactoring.	2022-02-09 18:16:07 +03:00
settings	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
user	Web: Login: Added usage of new API /authentication.json parameter "session"	2021-12-01 10:56:50 +03:00
client.js	Merge branch 'develop' into release/1.0.0	2021-09-15 14:45:33 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00