Commit Graph

1178 Commits

Author SHA1 Message Date
Vladislav Makhov
2afb10a135 Refactoring 2020-11-03 09:52:05 +03:00
Vladislav Makhov
f4e5ada7af Hide header nav, when desktop 2020-10-30 16:43:51 +03:00
Vladislav Makhov
94062cbd63 fix error 2020-10-30 16:06:21 +03:00
Vladislav Makhov
89d01e0b0b Refactoring 2020-10-30 15:32:56 +03:00
Vladislav Makhov
5221cd1f7a Made dropdown menu available, when desktop client uses and encryption is supported 2020-10-29 11:05:23 +03:00
Vladislav Makhov
6fb2f190df Add desktop cli and encryption uses detection 2020-10-28 20:01:45 +03:00
d241c610fe web: common: bump version 2020-10-28 13:37:32 +03:00
c53446f5bc Web: Common: fixed main container height 2020-10-28 13:35:06 +03:00
Vladislav Makhov
3b6883595a Move selector to auth 2020-10-27 14:47:07 +03:00
Vladislav Makhov
81f0342127 web: common: bump version 2020-10-27 14:46:39 +03:00
Vladislav Makhov
eab8d8e8e2 update yarn.lock 2020-10-27 14:28:56 +03:00
Vladislav Makhov
6249fd948d web: common: bump version 2020-10-27 14:16:39 +03:00
b548870886 Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector 2020-10-27 13:15:06 +03:00
Vladislav Makhov
64a72b522f Update yarn.lock 2020-10-27 10:49:55 +03:00
Vladislav Makhov
d91e79c011 web: common: bump version 2020-10-27 10:25:59 +03:00
Vladislav Makhov
7b458a72c9 Merge branch 'develop' into feature/private-room
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-10-23 15:49:10 +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
f6e261fc59 web: common: bump version 2020-10-23 12:02:09 +03:00
dc667af6ad Web: Common: Fixed login error handling 2020-10-23 11:51:53 +03:00
9df3a1cf64 Web: Files: Fixed display folder icon 2020-10-22 19:32:45 +03:00
2f86aef863 Web: Common: Applied display order on getRootForlders 2020-10-22 19:19:44 +03:00
6f8ed00dff Web: Common: Replaced getFoldersTree with single @root request 2020-10-22 18:51:31 +03:00
Vladislav Makhov
06ecce0ca5 Add "isEncryptionSupport" mock. 2020-10-21 17:08:36 +03:00
352c04fd5f
Merge branch 'develop' into feature/files-recent 2020-10-20 19:14:43 +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
05a6034b05
Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 20:53:59 +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
ed50f3bc98 Update yarn.lock files 2020-10-16 16:38:11 +03:00
fc20655f0a web: common: bump version 2020-10-16 16:27:42 +03:00
142c6d5e07 Web: Common: Added prettier package 2020-10-16 16:17:49 +03:00
69bca43c6c web: common: bump version 2020-10-16 15:58:30 +03:00
f2fcf077a2 Web: Common: Fixed start PageLayout story and README 2020-10-16 15:56:35 +03:00
0181514267 Web: Common: Fixed self link 2020-10-16 15:55:47 +03:00
1a484f1805 Web: Common: Applied prettier style fix 2020-10-16 15:38:04 +03:00
7251a1e4d8 Web: Common: Fixed error handling 2020-10-16 15:24:37 +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
Vladislav Makhov
ccab1949d5 Merge branch 'feature/files' 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/store/files/selectors.js
2020-10-16 11:28:31 +03:00
Ilya Oleshko
3e66f95546 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-15 13:39:31 +03:00
TatianaLopaeva
14bb36900c Update yarn.lock files 2020-10-15 11:22:58 +03:00
TatianaLopaeva
917cbe8a38 web: common: bump version 2020-10-15 10:56:17 +03:00
TatianaLopaeva
d4d7c9db0d Web: Common: fixed changing language of title toastr 2020-10-15 10:55:47 +03:00
Vladislav Makhov
02faf2a407 Refactoring 2020-10-14 19:01:53 +03:00
ea97ca05c2 Update yarn.lock files 2020-10-14 17:57:29 +03:00
d442e490f4 web: common: bump version 2020-10-14 17:47:23 +03:00
53c77d1a81 Web: Common: Removed useless folder param from API Files->getFolder with filter 2020-10-14 17:46:40 +03:00
Vladislav Makhov
4531619362 Merge branch 'feature/files' into feature/files-favorites 2020-10-14 13:45:13 +03:00
bac77e0ebd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
2020-10-13 18:17:31 +03:00