TatianaLopaeva ae17671043 Merge branch 'develop' into feature/backup ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/store/SettingsSetupStore.js		2021-06-18 18:08:38 +03:00
..
files	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00
groups	Web: People: fixed group list query	2021-04-05 16:18:41 +03:00
modules	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
people	Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators	2021-04-29 09:40:55 +03:00
portal	Web: Settings: Backup: Added possibility to disable options and added logic for third-party storage for manual backup.	2021-05-19 15:34:26 +03:00
settings	Merge branch 'develop' into feature/backup	2021-06-10 11:56:32 +03:00
user	Web: Common: added login with tfa code method	2021-05-17 16:32:22 +03:00
client.js	Web: Common: fixed reloading login page	2021-05-19 17:17:07 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00