|
|
17ead73174
|
Web: Files: Fix EmptyTrashDialog texts
|
2021-04-23 12:30:01 +03:00 |
|
|
|
c4e934f83f
|
Web: Files: Fix DeleteDialog texts and styles
|
2021-04-22 16:03:35 +03:00 |
|
|
|
a289256846
|
Web: Files: added ConflictResolveDialog, refactoring files operations
|
2021-04-16 16:04:50 +03:00 |
|
TatianaLopaeva
|
12db80a964
|
Web: Files: Added loader for NewFilesPanel.
|
2021-04-08 13:37:16 +03:00 |
|
Ilya Oleshko
|
a1a4eadd07
|
Web: Files: Row: Added locales for new and version badges
|
2021-04-06 18:48:42 +03:00 |
|
TatianaLopaeva
|
386529c6fd
|
Merge branch 'develop' into feature/EditorIntegration
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-04-01 10:17:14 +03:00 |
|
Vladislav Makhov
|
56f49526ad
|
web: files: fix link
|
2021-03-31 13:54:29 +03:00 |
|
TatianaLopaeva
|
3960ca1490
|
Web: Files: SharingPanel: Added loader when list of users does not load yet.
|
2021-03-30 15:24:44 +03:00 |
|
|
|
6c80ebdff0
|
Merge branch 'develop' into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
|
2021-02-20 17:31:58 +03:00 |
|
|
|
d8bd3f6e7c
|
Web: Files: Simplified translation
|
2021-02-19 21:57:01 +03:00 |
|
