Commit Graph

1702 Commits

Author SHA1 Message Date
Artem Tarasov
b55246fbd9 Web: Files: fixed variable name isNeedSetViewBox -> needSetViewBox 2020-11-06 16:19:13 +03:00
Viktor Fomin
1a4ced2195 Web: Files: fix color 2020-11-06 16:17:40 +03:00
Artem Tarasov
c791fa29aa Web: Files/Common: PageLayout: fixed margin-top in Header 2020-11-06 16:15:03 +03:00
d2e8890b7b
Merge branch 'develop' into hotfix/documents-bugfix 2020-11-06 15:49:30 +03:00
Artem Tarasov
54aac4c933 Web: Files: EditingWrapperComponent: removed transfer of arrow functions to components 2020-11-06 15:44:08 +03:00
2250baf7b7 Thirdparty: fix 2020-11-06 15:10:27 +03:00
Artem Tarasov
157226ce83 Web: Files: row: fixed margin-right icon 2020-11-06 14:46:08 +03:00
Artem Tarasov
ed1d182068 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-06 14:25:17 +03:00
Artem Tarasov
92dd80519f Web: Files: images in row: added setting viewBox for files icons 2020-11-06 14:14:38 +03:00
SuhorukovAnton
2a98447b82 x-www-form-urlencoded: update PrivacyRoomController 2020-11-06 13:30:57 +03:00
Artem Tarasov
aba7666ede Web: Files: SharingPanel: fixed margin icon 2020-11-06 13:28:17 +03:00
Artem Tarasov
63763ac499 Web: Files: StyledPanel: fixed font-size in ComboButton in AddUserPanel and AddGroupPanel 2020-11-06 12:46:21 +03:00
SuhorukovAnton
8b5a34d98f Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-06 12:05:30 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00
Artem Tarasov
13456f6dd0 Web: Files: applied icon MoveToIcon 2020-11-05 22:43:11 +03:00
Artem Tarasov
e1ebfe1cbf Web: Files: VersionHistory: added external link in row 2020-11-05 21:10:21 +03:00
Artem Tarasov
eb220f0987 Web: Files: fixed dropdowns 2020-11-05 20:35:05 +03:00
Vladislav Makhov
265ed05414 Merge branch 'develop' into feature/third-party-settings 2020-11-05 19:19:50 +03:00
e9b5992600 Fix PrivacyRoomController 2020-11-05 18:42:23 +03:00
Artem Tarasov
30adb42aaa Web: Files: added new icons for folder 24x24 2020-11-05 17:22:45 +03:00
Artem Tarasov
c2ea1cc19e Web: Files: settings: fixed gap between toggle button 2020-11-05 16:58:29 +03:00
Viktor Fomin
151dc898f5 Update yarn.lock files 2020-11-05 12:28:39 +03:00
Artem Tarasov
38c7faec04 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-05 11:57:55 +03:00
Viktor Fomin
081fe180bb Web: Files: rename headers components 2020-11-05 11:15:46 +03:00
Artem Tarasov
6a4cabcedf Web: Components/Files/People: fix styles 2020-11-05 09:22:14 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
Viktor Fomin
1fc0d91182 Web: Files: fix header loader 2020-11-04 12:23:35 +03:00
Viktor Fomin
91c254c638 Web: Common: fix main button loader 2020-11-03 18:36:19 +03:00
Vladislav Makhov
22a494a5ad yarn.lock update 2020-11-03 17:39:49 +03:00
Vladislav Makhov
1e483de4ba Merge branch 'develop' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
Artem Tarasov
e880ba8ba9 Web: Files: fixed position of contextButton in row 2020-11-03 15:14:13 +03:00
78b2dc4631 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-03 11:47:16 +03:00
f39d6e83b8 Files: refactoring 2020-11-03 11:47:05 +03:00
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +03:00
Artem Tarasov
2c6b10a58b Web: Files: Settings: fixed selection in the TreeSettings when switching from files 2020-11-02 21:17:28 +03:00
Artem Tarasov
bfcc46a546 Web: Files: Settings: fixed render MainButton 2020-11-02 20:56:58 +03:00
Artem Tarasov
fa1c8c8e37 Web: Files: selectors: added selector for icon of dragged file 2020-11-02 20:31:17 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
Artem Tarasov
f3231bd842 Web: Files: tooltip: refactoring tooltip when dragging' 2020-11-02 14:49:40 +03:00
Artem Tarasov
5f6e0e60e8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2020-11-02 13:36:03 +03:00
Artem Tarasov
6d41b0e64b Web: Files: Home: wixed style of tooltip when dragging 2020-11-02 13:19:06 +03:00
42b7b93832
Merge branch 'develop' into feature/article-resize 2020-11-02 11:44:08 +03:00
2ae201ebbd Files: privacy 2020-11-02 11:29:01 +03:00
Artem Tarasov
a3b2475405 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-02 09:23:36 +03:00
6baeee6ddd Files: fix startediting 2020-10-31 18:14:37 +03:00
Ilya Oleshko
7726e17170 Merge branch 'develop' into feature/article-resize 2020-10-30 15:32:25 +03:00
Artem Tarasov
bda078beee Web: Files: selectors: fixed selection when dragging 2020-10-30 15:28:57 +03:00
Artem Tarasov
3caf7d6339 Merge branch 'develop' into hotfix/documents-bugfix 2020-10-30 15:25:30 +03:00
Ilya Oleshko
a823763af7 Web: Files : Body : RowContent : Fixed badges actions and styles 2020-10-30 15:20:06 +03:00
Ilya Oleshko
b1b402768b Web: Files : Body : Added context to RowContainer 2020-10-30 14:25:04 +03:00
Ilya Oleshko
3b9679957e Web: Files : Header : Added context to Header 2020-10-30 14:22:30 +03:00
Ilya Oleshko
c28b1d0121 Web: Components : RowContent : Renamed width property, fixed usage 2020-10-30 14:19:59 +03:00
f5ae1c4b0e Web: Files: fixed setIsLoading 2020-10-30 14:13:54 +03:00
496d908f6d Notify: fix 2020-10-30 10:23:35 +03:00
bc725f29df Web: Common: added re-resizable package, added new acticle 2020-10-29 17:33:05 +03:00
Artem Tarasov
5619974f12 Merge branch 'develop' into hotfix/documents-bugfix 2020-10-29 17:21:25 +03:00
Artem Tarasov
076cf154a6 Web: Files: Settings: fixed margin on Common Settongs 2020-10-29 16:24:50 +03:00
Artem Tarasov
088df7adf5 Web: Files: Settings: fixed styles of headline 2020-10-29 14:23:37 +03:00
Artem Tarasov
661b004c46 Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-10-29 13:29:31 +03:00
Artem Tarasov
730d5a2d1b Web: Files: FilesRowContent: fixed margin bettween badges 2020-10-29 13:28:23 +03:00
a163c439d3 Merge branch 'develop' into feature/fixed-dragging 2020-10-29 13:23:37 +03:00
77e9f78d55 Web: Files: fixed dragging 2020-10-29 12:35:53 +03:00
70d3e51520 Web: Files: added drag cursor 2020-10-29 12:35:17 +03:00
Alexey Kostenko
4150acdca8 Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-10-29 12:01:36 +03:00
Artem Tarasov
3f19b3e994 Web: Files: fixed margin headline 2020-10-29 11:41:31 +03:00
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
Artem Tarasov
f8d34cbf99 Web: Files: VersionHistory: fixed styles for ModalDialog for tablets 2020-10-29 11:12:29 +03:00
Alexey Kostenko
f6b6ddcd64 Web: Files: AddUsersPanel: Fixed arrow button color 2020-10-29 11:00:53 +03:00
Alexey Kostenko
55830ab25c Web: Common/Files: PeopleSelector: Added counter to footer button 2020-10-29 10:55:06 +03:00
Alexey Kostenko
19f1984e73 Web: Common/Files: GroupSelector: Added counter to footer button 2020-10-29 10:54:10 +03:00
Alexey Kostenko
0b989971a6 Web: Files: AddGroupsPanel: Fixed styles in footer buttons 2020-10-28 17:37:41 +03:00
Alexey Kostenko
1e78053efa Web: Files: AddGroups: Fixed header styles 2020-10-28 16:22:35 +03:00
Alexey Kostenko
2f7f4d7afb Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-10-28 15:54:59 +03:00
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
Vladislav Makhov
f14eaabf50 Remove unused code 2020-10-28 14:18:02 +03:00
Artem Tarasov
e9144b7f67 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-10-28 14:07:50 +03:00
Artem Tarasov
5c17b419b9 Web: Files: fixed styles VersionHistory 2020-10-28 14:04:11 +03:00
Vladislav Makhov
89a102ee17 Refactor move operations with actions. 2020-10-28 14:03:58 +03:00
Vladislav Makhov
01e25257b5 Delete unused code 2020-10-28 11:46:08 +03:00
Vladislav Makhov
97ed3121cc Add selector to receive operation folders data 2020-10-28 11:42:05 +03:00
Artem Tarasov
5dba586e3d Web: Files: VersionHistory: fixed position of the expandButton 2020-10-28 11:10:52 +03:00
Artem Tarasov
c7963546f1 Web: Files: VersionHistory: fixed margin, font-size 2020-10-28 11:02:01 +03:00
Artem Tarasov
b5b84df97a Web: Files: VersionHistory: fixed margin in row 2020-10-28 10:37:43 +03:00
Alexey Kostenko
92bcfdf8df Web: Files: Fixed external link menu in SharingPanel 2020-10-28 09:50:59 +03:00
Artem Tarasov
44fdb0a2c0 Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-10-28 09:44:23 +03:00
Artem Tarasov
f091170886 Web: Files: VersionHistory: fixed height of row 2020-10-28 09:43:58 +03:00
Vladislav Makhov
626a2a60a2 Fix OperationsPanel move menu 2020-10-28 09:33:43 +03:00
Alexey Kostenko
23ecb65ea9 Web: Files: fixed footer in SharingPanel 2020-10-28 09:13:43 +03:00
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +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
75bbe888cd Scope: refactoring. Migration, ASC.Files.Service 2020-10-26 19:38:23 +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
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +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
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
Alexey Kostenko
a1aaf8acf2 Web: Files: Fix header styles 2020-10-21 13:28:15 +03:00
1d2f65ba12 Refactoring: scope 2020-10-20 23:10:17 +03:00
352c04fd5f
Merge branch 'develop' into feature/files-recent 2020-10-20 19:14:43 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +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
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +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
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +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
3a29e9970f Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Server/Startup.cs
2020-10-18 22:52:24 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +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
TatianaLopaeva
7fef9285ce Web: Files: Added data-format 2020-10-12 17:20:36 +03:00
TatianaLopaeva
1010886262 Web: Refactoring 2020-10-12 16:56:34 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
Ilya Oleshko
cdaef9e76f Web: Files : Home : Fixed MediaViewer collection with selectors 2020-10-12 16:40:11 +03:00
TatianaLopaeva
6557261ac8 Web: Files: Changed margin by layout 2020-10-12 16:20:06 +03:00
TatianaLopaeva
4b81c0adfd Web: Files: Added images by layout 2020-10-12 16:15:35 +03:00
Vladislav Makhov
cdddef441a merge fix 2020-10-12 15:50:46 +03:00
Artem Tarasov
a6257d7006 Web: Files: Settings: fixed blinking of Settings page when jump from Folders page 2020-10-12 15:40:11 +03:00
577fc5ac70 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
2020-10-12 15:36:26 +03:00
Artem Tarasov
ba8564ffe5 Web: Files: Settings: applied SettingsFiles loader 2020-10-12 15:34:46 +03:00
824961ddec Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring 2020-10-12 15:28:36 +03:00
Vladislav Makhov
a179ae0e6c Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-12 14:45:53 +03:00
Vladislav Makhov
7aaeddedb2 Add pushing to recently viewed 2020-10-12 14:37:52 +03:00
17e0de56da Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-12 11:31:24 +03:00
344acefa9b Files: fix filter 2020-10-12 11:26:15 +03:00
Vladislav Makhov
9ea5a648e9 Fix code after merge 2020-10-12 11:02:22 +03:00
Vladislav Makhov
2476b306f9 Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	web/ASC.Web.Common/src/api/files/index.js
#	web/ASC.Web.Components/package.json
2020-10-12 10:04:24 +03:00
SuhorukovAnton
917493f397 fix-messages: IDE0058 2020-10-10 14:35:05 +03:00
15f4b38a03
Web: Files: Remove hack 2020-10-09 21:39:34 +03:00
ee6307e288 Web: People: Added hack for build machine only 2020-10-09 19:14:48 +03:00
9f6f7b4bff Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-09 18:11:11 +03:00
e25c59fb09 Web: Files: Changed initialization of DocsAPI 2020-10-09 18:11:02 +03:00
615f514bfd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-10-09 17:24:50 +03:00
SuhorukovAnton
72fbf6b81e remove-FileOperationsManagerHelper: first version 2020-10-09 17:13:44 +03:00
Ilya Oleshko
a129bda5ee Web: Files : Home : Added share button at row 2020-10-09 17:08:29 +03:00
Vladislav Makhov
f4abe419db Fix bug with add/remove from Share folder 2020-10-09 17:03:08 +03:00
a71fd1208b Web: Files: fixed Home render, added new select logic 2020-10-09 16:43:50 +03:00
290f7649f1 Web: Files: fixed updating of the tree after operations with folders 2020-10-09 15:55:30 +03:00
e01ee037f2 Merge branch 'master' into feature/fix-messages
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
1dfd7afe1c Update yarn.lock files 2020-10-09 15:07:41 +03:00
4cbaad0dfc Web: Files: fixed tree drag 2020-10-09 14:36:38 +03:00
226d4c6cc5 Web: Files: Add and applied Filter loader 2020-10-09 14:23:40 +03:00
215e33d053 Web: Files: Replaced hard-coded link for DocsAPI 2020-10-09 13:39:22 +03:00
SuhorukovAnton
370400e4c0 fix_API_return: first version 2020-10-09 13:05:48 +03:00
68d32c7335 Web: Files: removed useless loopFilesOperations prop 2020-10-09 12:32:06 +03:00
dbfc5a6a96 Web: Files: fixed Home render 2020-10-09 11:57:40 +03:00
Ilya Oleshko
a1e696f6ae Web: Files : Selectors : Added property to selector 2020-10-09 11:46:53 +03:00
Ilya Oleshko
76c09fb7ee Web: Files : Actions : Fixed selectors 2020-10-09 11:46:22 +03:00
Ilya Oleshko
333b3f1e79 Web: Files : Panels : Fixed selectors 2020-10-09 11:46:03 +03:00
Ilya Oleshko
8440737f70 Web: Files : Home : Fixed selector for create url 2020-10-09 11:45:29 +03:00
Ilya Oleshko
8f4b6dd021 Web: Files : Home : Fixed selectors for tile content 2020-10-09 11:44:28 +03:00
Ilya Oleshko
404b775303 Web: Files : Home : Fixed selectors for tile badges 2020-10-09 11:44:06 +03:00
3385d0b2f5 Web: Files: fixed files operations 2020-10-08 23:58:21 +03:00
3ca0990715 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-08 19:01:09 +03:00
b95816a388 Merge branch 'feature/selectors-refactoring' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/selectors-refactoring 2020-10-08 17:54:14 +03:00
718dc8cc5a Web: Files: fixed dragging 2020-10-08 17:54:04 +03:00
Ilya Oleshko
fa0c649fe2 Web: Files : Home : Added icon for temp item on create 2020-10-08 17:13:49 +03:00
Ilya Oleshko
033a67863e Web: Files : Selectors : Fixed isMediaOrImage usage for context menu 2020-10-08 16:56:01 +03:00
Vladislav Makhov
b4d3dc0114 Fix code after merge 2020-10-08 16:23:57 +03:00
Ilya Oleshko
1d79a2709f Web: Files : Home : Added selectors for formats and media viewer 2020-10-08 16:03:37 +03:00
Ilya Oleshko
a0a680aa7e Web: Files : Home : Added selectors for formats 2020-10-08 16:02:52 +03:00
Ilya Oleshko
79b6f43df0 Web: Files : Selectors : Added file format selectors, fixed fileList params 2020-10-08 16:02:03 +03:00