Commit Graph

888 Commits

Author SHA1 Message Date
Artem Tarasov
e4599f8279 Web: Files: VersionHistory: added props borderBottom for header(tablet) 2020-10-27 15:15:57 +03:00
Artem Tarasov
0322fdcd8e Web: Components/Files: fixed style Share button 2020-10-27 11:49:41 +03:00
Artem Tarasov
b77095f836 Web: Files: home: fixeds margin-right arrow button 2020-10-26 13:51:18 +03:00
Artem Tarasov
693f11e66a Web: Files: TreeSettings: fixed margin-top 2020-10-26 10:53:53 +03:00
Artem Tarasov
b787b58b6c Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-10-26 09:32:29 +03:00
Artem Tarasov
a220443afb Web: Components: tree-menu: fixed props 2020-10-26 08:38:04 +03:00
eee01c25e6 Web: Files: Fixed render with empty JSX 2020-10-23 15:01:07 +03:00
Artem Tarasov
7d1c806f28 Web: Files: tree: fixed desktop layout 2020-10-23 14:27:42 +03:00
6848dcfad7 Web: Files: Fixed MoveTo/CopyTo operations (no loopFilesOperations action inside props) 2020-10-23 14:01:02 +03:00
cb849577fb Update yarn.lock files 2020-10-23 13:45:17 +03:00
b585313aa5 Update yarn.lock files 2020-10-23 12:21:57 +03:00
d64f82f848 Web: Files: Removed hard-coded string error 2020-10-23 12:01:53 +03:00
9df3a1cf64 Web: Files: Fixed display folder icon 2020-10-22 19:32:45 +03:00
Alexey Kostenko
926e3c3362 Web: Files/Components: Fixed styles dropDownItem in mainButton 2020-10-22 16:24:24 +03:00
Alexey Kostenko
bb00498c44 Web: Common/Components/Files: Fixed filter and file create field styles 2020-10-22 14:10:58 +03:00
Alexey Kostenko
e1693adcdb Web: Files/Components: Fixed mobile row styles 2020-10-22 13:47:54 +03:00
Alexey Kostenko
ad2314ffd1 Web: Files: Fixed styles in file creation field 2020-10-22 13:28:51 +03:00
Alexey Kostenko
b6aefda481 Web: Files/Components: Fixed file creation field 2020-10-22 13:21:37 +03:00
Alexey Kostenko
747bf783b8 Web: Components/Files: Fixed row styles 2020-10-22 10:38:43 +03:00
Alexey Kostenko
5f4921d341 Web: Files/Components/Common: Fixed row styles 2020-10-21 16:54:22 +03:00
Alexey Kostenko
a1aaf8acf2 Web: Files: Fix header styles 2020-10-21 13:28:15 +03:00
352c04fd5f
Merge branch 'develop' into feature/files-recent 2020-10-20 19:14:43 +03:00
Vladislav Makhov
d012d8f724 Add new context menu item: "Open location". 2020-10-20 11:04:50 +03:00
Vladislav Makhov
967a01061a Merge branch 'develop' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Common/src/api/files/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-10-20 09:23:58 +03:00
Vladislav Makhov
897a9cc24b Fix folder creation 2020-10-20 09:09:25 +03:00
05a6034b05
Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 20:53:59 +03:00
Vladislav Makhov
500ac20bdc Adding to recent then create file. 2020-10-19 18:56:35 +03:00
Vladislav Makhov
e0dacb3a60 Merge branch 'develop' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-19 18:20:36 +03:00
Vladislav Makhov
2757a785a0 Merge branch 'develop' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-19 17:54:41 +03:00
TatianaLopaeva
2dd956c700 Update yarn.lock files 2020-10-19 13:41:22 +03:00
TatianaLopaeva
41d0c3e9d9 Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 12:11:34 +03:00
Vladislav Makhov
fee23e5947 Fix code after merge 2020-10-19 10:58:24 +03:00
Vladislav Makhov
3578340bcd Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
2020-10-16 17:15:14 +03:00
38cd808b4e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-16 16:44:18 +03:00
a6d9908d00 Web: Files: remove duplicate fetchFolder 2020-10-16 16:45:44 +03:00
70b736998b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
2020-10-16 16:44:10 +03:00
ed50f3bc98 Update yarn.lock files 2020-10-16 16:38:11 +03:00
Ilya Oleshko
c8cfe099ce Web: Files : RowContent : Disable file actions inside recycle 2020-10-16 16:33:25 +03:00
2ea8e5cf1c Web: Files: Applied prettier style fix 2020-10-16 16:27:22 +03:00
TatianaLopaeva
14af00ffd7 Web: Added styles and changed images by layout 2020-10-16 16:21:33 +03:00
Vladislav Makhov
e58a88af29 Fix code after merge 2020-10-16 16:16:51 +03:00
Ilya Oleshko
312856acf1 Web: Files : RowContent : Auto formatting, disable file actions inside recycle 2020-10-16 16:12:37 +03:00
Ilya Oleshko
5c4df62c77 Web: Files : Body : Not render share button in recycle 2020-10-16 16:11:30 +03:00
d636c68ae6 Web: Files: fixed share translation 2020-10-16 16:09:59 +03:00
Ilya Oleshko
d5d4418536 Web: Files : NewFilesPanel : Fixed file open 2020-10-16 15:42:07 +03:00
Ilya Oleshko
74cae29b38 Web: Files : Selectors : Fixed filesList selector 2020-10-16 15:41:21 +03:00
30f301435e Web: Files: fixed the update of the badge in the tree 2020-10-16 15:06:49 +03:00
Artem Tarasov
89b2ace28b Web: Files: treeFolders: fixed badge display 2020-10-16 14:33:54 +03:00
Vladislav Makhov
3491938aa4 Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.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/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-16 14:33:20 +03:00
Ilya Oleshko
bdad54951a Web: Files : NewFilesPanel : Fixed mapState error, temporary disabled open file inside panel 2020-10-16 14:08:52 +03:00