Commit Graph

1454 Commits

Author SHA1 Message Date
Alexey Kostenko
23ecb65ea9 Web: Files: fixed footer in SharingPanel 2020-10-28 09:13:43 +03:00
Alexey Kostenko
910433f8e3 Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-10-27 17:41:20 +03:00
Alexey Kostenko
fb2e9c39db Web: Files: Fixed styles in sharing row 2020-10-27 17:38:08 +03:00
Alexey Kostenko
34780f7735 Web: Files: Fixed sharing row styles 2020-10-27 17:06:52 +03:00
Alexey Kostenko
284034cbb4 Web: Files: Fixed header in sharing panel settings 2020-10-27 16:02:21 +03:00
Artem Tarasov
e4599f8279 Web: Files: VersionHistory: added props borderBottom for header(tablet) 2020-10-27 15:15:57 +03:00
Vladislav Makhov
3b6883595a Move selector to auth 2020-10-27 14:47:07 +03:00
Vladislav Makhov
eab8d8e8e2 update yarn.lock 2020-10-27 14:28:56 +03:00
Vladislav Makhov
44050626b4 Fix console warnings 2020-10-27 14:21:30 +03:00
Vladislav Makhov
ab0b1c5ee6 Refactor description translation. 2020-10-27 14:21:05 +03:00
b548870886 Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector 2020-10-27 13:15:06 +03:00
Artem Tarasov
0322fdcd8e Web: Components/Files: fixed style Share button 2020-10-27 11:49:41 +03:00
Alexey Kostenko
b8d285ef8f Web: Files: Fixed main button drop down styles (mobile) 2020-10-27 11:17:15 +03:00
Vladislav Makhov
64a72b522f Update yarn.lock 2020-10-27 10:49:55 +03:00
Vladislav Makhov
32b1d5914f Add private room selectors 2020-10-26 16:23:00 +03:00
Vladislav Makhov
6ba6ba2e64 Refactoring of private room mock 2020-10-26 16:22:47 +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
Vladislav Makhov
e5c5f9194d Fix code after merge 2020-10-23 16:01:10 +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
Vladislav Makhov
af0d47d474 Add translation 2020-10-23 15:31:45 +03:00
Vladislav Makhov
23c157e279 Update tree node with private room 2020-10-23 15:31:33 +03:00
Vladislav Makhov
5441db9b76 Add private room empty screen container 2020-10-23 15:31:10 +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
949cc1bd56 Startup revert 2020-10-22 17:32:53 +03:00
86a15c35aa Added root folder request 2020-10-22 17:17:20 +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
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
5cddd2061d Files: fixed delete 2020-10-16 19:05:21 +03:00
79e07ed817 Files: fixed create folder 2020-10-16 17:39:13 +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
18ef6e7cb6 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +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
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +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
Vladislav Makhov
3e3fce0638 Fix code after merge 2020-10-16 12:55:56 +03:00
4b2f687cab Web: Files: Skip useless API requests on Editor opening 2020-10-16 12:15:54 +03:00
99ae158992 Web: Files: Removed useless API request call 2020-10-16 12:09:17 +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
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00
fa54990786 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 19:04:19 +03:00
6e7e09b91b Revert "Web: Files: moved SimpleFilesRow to a separate file, removed the bind"
This reverts commit 43dc6d81a5.
2020-10-15 18:08:09 +03:00
ff1c1765b5 Web: Clients: Turned off Suspense fallback 2020-10-15 18:07:23 +03:00
43dc6d81a5 Web: Files: moved SimpleFilesRow to a separate file, removed the bind 2020-10-15 14:40:17 +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
Artem Tarasov
3ee236c25b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 10:56:57 +03:00
Artem Tarasov
6e6bcbd92f Web: Files: TreeFolders: badge for showing new elements moved to component TreeMenu 2020-10-15 10:55:01 +03:00
Artem Tarasov
8930f98cdd Web: Files: settings: fixed to display loader 2020-10-15 10:52:51 +03:00
0fdd5dac10 Web: Files: added reselect to getSelection selector 2020-10-15 10:22:06 +03:00
Vladislav Makhov
02faf2a407 Refactoring 2020-10-14 19:01:53 +03:00
Ilya Oleshko
55fbdf2fe9 Web: Files : Body : Fixed tooltip after merge 2020-10-14 18:09:24 +03:00
Vladislav Makhov
207de2413d Fix remove from favorites 2020-10-14 18:04:47 +03:00
ea97ca05c2 Update yarn.lock files 2020-10-14 17:57:29 +03:00
Ilya Oleshko
5a75c16794 Web: Files : Header : Fixed menuItems 2020-10-14 17:40:39 +03:00
Ilya Oleshko
991e28ab86 Web: Files : Home : Fixed shared icon styles 2020-10-14 17:39:56 +03:00
Ilya Oleshko
51fd3ef672 Web: Files : Selectors : Added selectors 2020-10-14 17:38:45 +03:00
Vladislav Makhov
6a6efd1109 Add translate 2020-10-14 17:30:37 +03:00
Vladislav Makhov
7d6d7d2bc8 Revert "Fix filter search"
This reverts commit 783c81fdb4.
2020-10-14 17:23:24 +03:00
5cf2798aa4 Web: Files: fixed opening SharingPanel 2020-10-14 17:22:20 +03:00
Vladislav Makhov
5fe6fd0497 Remove filter reset 2020-10-14 17:22:17 +03:00
a6c29d8931 Web: Files: moved getTooltipLabel to selectors, refactoring 2020-10-14 16:09:15 +03:00
Vladislav Makhov
9fa9560d8e Filter reset while select another node. 2020-10-14 14:11:22 +03:00
Vladislav Makhov
4531619362 Merge branch 'feature/files' into feature/files-favorites 2020-10-14 13:45:13 +03:00
Vladislav Makhov
783c81fdb4 Fix filter search 2020-10-14 13:17:44 +03:00
70ff8c62ae Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-14 13:00:37 +03:00
3ce984b374 Web: Files: removed useless code from DocEditor 2020-10-14 12:57:00 +03:00
00e6ddcd97 Web: Files: rename isCanCreate to canCreate, fixed merge 2020-10-14 12:46:56 +03:00
4a0a683c68 fix 2020-10-14 12:11:04 +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
49f5a52433 Update yarn.lock files 2020-10-13 16:52:17 +03:00
8205c230c7 Web: Clients: Added displaying Loader.Filter for MainButton 2020-10-13 16:43:41 +03:00
2fa205cb6f Web: Clients: Fixed catching of initial API errors 2020-10-13 16:31:21 +03:00
746ecc7f40 Web: Clients: Fixed applying single cursor on loading 2020-10-13 16:20:49 +03:00
3dd9f71dda Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 15:51:24 +03:00
5d76e7e6b0 Web: Redesigned displaying of loading processes 2020-10-13 15:51:14 +03:00
5c42b9d04e Merge branch 'master' into feature/remove-FileOperationsManagerHelper 2020-10-13 15:50:51 +03:00
668cb3e893 Merge branch 'master' into feature/files 2020-10-13 15:27:31 +03:00
bcbefb8f26 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-13 15:08:22 +03:00
Vladislav Makhov
632f83927b Merge branch 'feature/files' into feature/files-favorites 2020-10-13 14:26:31 +03:00
0ae5ec1b1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 14:02:11 +03:00
b53e34a0f0 Web: Removed useless Link duplicates 2020-10-13 14:02:04 +03:00
Artem Tarasov
a4a959f972 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 13:43:16 +03:00
Artem Tarasov
2623c91e80 Web: Files: fixed render loader 2020-10-13 13:42:28 +03:00
3d34978bf0 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-13 13:39:10 +03:00
9968873305 Merge branch 'master' into feature/fix_API_return
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
1d4b3785bb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-13 13:31:24 +03:00
0712677297 Web: Common: fixed MediaViewer close, fixed share dropdown styles 2020-10-13 13:30:26 +03:00
Vladislav Makhov
6bcfcc4987 Merge branch 'feature/files' into feature/files-recent 2020-10-13 13:16:37 +03:00
Artem Tarasov
e2bb4a8405 Web: Files: TreeSettings: fixed render of settings before receiving a response from the server 2020-10-13 13:15:17 +03:00
a504251359
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
2020-10-13 12:55:37 +03:00
02f39a9c71 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
Artem Tarasov
33d0322fb4 Web: Files: TreeSettings: refactoring 2020-10-13 12:50:39 +03:00
TatianaLopaeva
579d543292 Merge branch 'feature/files' into feature/fix-changing-language 2020-10-13 12:38:46 +03:00
TatianaLopaeva
4ef2db2ed0 Web: Update yarn.lock 2020-10-13 12:37:34 +03:00
Ilya Oleshko
abee1c8a8e Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-13 12:10:55 +03:00
Ilya Oleshko
2f88af1137 Web: Files : Home : Added isEdit condition for render share button 2020-10-13 11:58:28 +03:00
a1bcf2eb3e Merge branch 'master' into feature/fix-messages 2020-10-13 11:28:19 +03:00
TatianaLopaeva
f0299db016 Update yarn.lock 2020-10-13 11:14:09 +03:00
b4a0a302e6 Files: fix di 2020-10-13 10:28:13 +03:00
cefc64422e Files: fix di 2020-10-13 10:23:53 +03:00
ae8fd12b35 Files: fix di 2020-10-13 10:21:02 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
5e11f96a0c fix 2020-10-12 22:15:27 +03:00
a8b838b4ce fix 2020-10-12 22:12:03 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
TatianaLopaeva
a01b1e6430 Web: Files: Added data-format 2020-10-12 18:25:39 +03:00
Ilya Oleshko
989a854d32 Web: Files : Home : Fixed ShareButton after merge 2020-10-12 17:40:26 +03:00