Commit Graph

2950 Commits

Author SHA1 Message Date
Alexey Kostenko
e29eeb2f4b Web: Common/Client: FilterInput: Added sectionWidth prop 2020-11-11 07:27:42 +03:00
Viktor Fomin
0852dd0814 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-10 18:25:25 +03:00
Viktor Fomin
2ebd7e882c Web: People: fix first loader 2020-11-10 18:20:56 +03:00
Viktor Fomin
237084a749 Web: Files: fix first loader 2020-11-10 18:20:42 +03:00
Viktor Fomin
df4c89cb91
Merge branch 'develop' into feature/filter-loader 2020-11-10 18:09:58 +03:00
Viktor Fomin
0490c8c3f0 Update yarn.lock files 2020-11-10 18:08:51 +03:00
Viktor Fomin
a82551568b Web: People: fix props name 2020-11-10 17:30:43 +03:00
Ilya Oleshko
8a462c1e7a Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 17:07:00 +03:00
Ilya Oleshko
cf5573c74b Web: Files : Settings : Fixed style of input 2020-11-10 16:30:22 +03:00
a1541da672 Web: Files: added thirdParty icons 2020-11-10 15:12:14 +03:00
SuhorukovAnton
6e2860a7e5 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-10 14:51:33 +03:00
Artem Tarasov
02aed65d60 Web: Files: DocEditor: fixed of mobile view 2020-11-10 14:29:59 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
Artem Tarasov
4031a609b8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
Artem Tarasov
f578e43662 Web: Files: Settings: refactoring 2020-11-10 13:31:16 +03:00
9b10dd39ee Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 12:59:40 +03:00
fa2a510a8a Web: Files: added thirdParty api, added new thirdParty dialogs 2020-11-10 12:50:07 +03:00
1da1cde38e Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2020-11-10 12:29:57 +03:00
Ilya Oleshko
ecefe5c859 Web: Files : Body : Fixed render for services folder 2020-11-10 11:43:05 +03:00
1490332568 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
Ilya Oleshko
60286af94f Web: Files : Selectors : Added providerItem selector for render services folders 2020-11-10 11:41:42 +03:00
4458bca039 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-10 11:21:34 +03:00
6947185bab Files: refactoring 2020-11-10 11:21:22 +03:00
Ilya Oleshko
6c0c32420a Merge branch 'develop' into feature/thirdparty-integrations 2020-11-10 11:11:09 +03:00
Viktor Fomin
9cbe89d4b5
Merge branch 'develop' into feature/filter-loader 2020-11-10 11:02:29 +03:00
Viktor Fomin
834e8e6516 Update yarn.lock files 2020-11-10 10:46:26 +03:00
Viktor Fomin
8648abedbd Web: People: delete first header preloader 2020-11-10 10:40:33 +03:00
Viktor Fomin
067ee4fc5a Web: Files: delete first header preloader 2020-11-10 10:40:17 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Viktor Fomin
afd252e2ce Web: People: fix profile action loader 2020-11-10 03:08:59 +03:00
Viktor Fomin
515bd0d05f Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-09 23:02:18 +03:00
Viktor Fomin
a7dee56194 Update yarn.lock files 2020-11-09 23:01:57 +03:00
Viktor Fomin
9f19173195 Web: People: added circle in row 2020-11-09 22:57:02 +03:00
4dd9c6f554 Update yarn.lock files 2020-11-09 22:35:39 +03:00
d012aa6071 Merge branch 'develop' into feature/filter-loader
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-11-09 22:15:04 +03:00
Artem Tarasov
066140f388 Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal 2020-11-09 18:59:06 +03:00
Artem Tarasov
57ca2d2603 Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file 2020-11-09 18:33:45 +03:00
Ilya Oleshko
82a2520150 Web: Files : Body : Fixed preload tab for new documents 2020-11-09 18:29:06 +03:00
3c38343063 Fix download.
fix thirdparty
2020-11-09 17:46:49 +03:00
Viktor Fomin
6e8685d8d6 Update yarn.lock files 2020-11-09 16:54:13 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
cb9e450f52 Web: Files: removed useless operationsPanelProps 2020-11-09 16:11:56 +03:00
Artem Tarasov
46ed4741a6 Web: Files/Components: deleted console.log, unusing code, refactoring 2020-11-09 15:23:20 +03:00
Viktor Fomin
b3f4bd3f64 Update yarn.lock files 2020-11-09 15:16:44 +03:00
Artem Tarasov
11d91fe21f Web: Files/Components: tree-menu: fixed selection 2020-11-09 15:16:15 +03:00
Viktor Fomin
33ef924307 Web: People: fix first loader 2020-11-09 15:11:04 +03:00
Viktor Fomin
7211978a38 Web: Files: fix first loader 2020-11-09 15:10:51 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
884cb67a35 Web: People: delete logo 2020-11-09 13:07:43 +03:00
Viktor Fomin
3c84424d8f Web: Files: delete logo 2020-11-09 13:07:27 +03:00
Artem Tarasov
4482f70cd3 Web: Files: VersionHistory: added arrow-button in header 2020-11-09 12:42:41 +03:00
Viktor Fomin
445b2e83b5 Web: People: delete loading label 2020-11-09 12:37:13 +03:00
Artem Tarasov
fa8e8341e2 Web: Components/Files: fixed warrnings 2020-11-09 12:11:08 +03:00
Artem Tarasov
1bd3db6a17 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-09 11:21:34 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
a984f9233d Merge branch 'develop' into feature/thirdparty-integrations 2020-11-06 18:23:59 +03:00
Artem Tarasov
43bb83692d Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-11-06 18:08:22 +03:00
37fa37f473 Files: fix autofac 2020-11-06 17:54:48 +03:00
Artem Tarasov
612661a22b Web: Files/Common: MainButton: fixed line-height 2020-11-06 16:43:14 +03:00
Artem Tarasov
9f46d7211f Web: Files: Settings: fixed key fot translations 2020-11-06 16:32:47 +03:00
Artem Tarasov
48c4f3b0f2 Web: VersionHistory: deleted unusing code 2020-11-06 16:22:58 +03:00
Artem Tarasov
b55246fbd9 Web: Files: fixed variable name isNeedSetViewBox -> needSetViewBox 2020-11-06 16:19:13 +03:00
Viktor Fomin
b1f9db662d Web: People: fix color 2020-11-06 16:17:56 +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
Ilya Oleshko
d8c403f662 Merge branch 'develop' into feature/thirdparty-integrations 2020-11-06 15:30:35 +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
89c6e5548c x-www-form-urlencoded: fix 2020-11-06 13:39:25 +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
SuhorukovAnton
7b8efca8b3 x-www-form-urlencoded: fix 2020-11-06 12:46:57 +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
15134f2beb Web: Files: added setting thirdParty page with translations 2020-11-06 12:14:02 +03:00
8aad3dbc6f Web: Files: added new icons 2020-11-06 12:08:29 +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
Artem Tarasov
ace2111197 Web: People: applied prop size for Avatar Component 2020-11-05 11:40:19 +03:00
Viktor Fomin
3bdff517f9 Web: People: rename headers components 2020-11-05 11:16:33 +03:00
Viktor Fomin
081fe180bb Web: Files: rename headers components 2020-11-05 11:15:46 +03:00
Artem Tarasov
df9a1658e9 Web: People: refactoring 2020-11-05 09:44:20 +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
72467a70c2 Web: People: fix header loader 2020-11-04 12:24:02 +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
318202ca57 Web: People : UserContent : Added sectionWidth property, fixed missing styles 2020-10-30 14:23:56 +03:00
Ilya Oleshko
b055c0224a Web: People : Body : Added context to RowContainer 2020-10-30 14:23:23 +03:00
Ilya Oleshko
648427fbf4 Web: People : Header : Added context to Header 2020-10-30 14:22:48 +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
265feee81e Refactoring: scope 2020-10-29 12:31:55 +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