Commit Graph

14 Commits

Author SHA1 Message Date
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
95aaff4e68 Web: api: Changed parameters at url. 2021-06-18 11:07:06 +03:00
c257b501fe Web: Files: SelectFileDialog: Changed api parameters. 2021-06-16 14:17:12 +03:00
058445461b Web: Files: Added SelectFile component for documents, refactoring. 2021-06-15 18:11:48 +03:00
d07273cee8 Web: Files: fixed display of tree menu, added new api for tree menu 2021-06-15 14:15:48 +03:00
ef59a2ac47 Web: Files: added hideConfirmConvert setting 2021-06-11 15:49:32 +03:00
3c6f831618 Web: Common: Api: Added removeShareFiles api method 2021-05-19 16:51:43 +03:00
ef085ef7df Web: Files: enable favorites and recent settings 2021-05-14 11:08:57 +03:00
bdc681f94a Web: Files: Fix favorite flag setup (thirdParty issue) 2021-05-04 11:18:24 +03:00
a46f8ed04a Web: Common: Fix openEdit query param 2021-04-26 19:02:40 +03:00
cd699e37e2 Files: Fix opening of version 2021-04-23 18:00:05 +03:00
a289256846 Web: Files: added ConflictResolveDialog, refactoring files operations 2021-04-16 16:04:50 +03:00
deafba32a7 Web: Files: Fix conversation of Filter to URL and back 2021-03-20 12:51:08 +03:00
Artem Tarasov
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00