|
|
862fd8c9ca
|
Web: Files: added action to connect button
|
2020-11-13 18:46:42 +03:00 |
|
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
|
|
67507d707d
|
Web: Files: fixed remove services
|
2020-11-13 11:48:42 +03:00 |
|
Alexey Kostenko
|
df060ba8a2
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-13 10:58:34 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +03:00 |
|
|
|
d6999c6f3b
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-12 18:36:17 +03:00 |
|
|
|
c20df9760c
|
Web: Files: fixed thirdparty tree node
|
2020-11-12 18:36:09 +03:00 |
|
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
Ilya Oleshko
|
10b511e1dd
|
Web: Files : Article : Fixed ThirdParty buttons styles
|
2020-11-12 17:06:38 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Ilya Oleshko
|
0f34cbcfbd
|
Web: Files : Selectors : Fixed icons name
|
2020-11-12 15:01:33 +03:00 |
|
Ilya Oleshko
|
9e28ae23f0
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2020-11-12 14:46:29 +03:00 |
|
Ilya Oleshko
|
385f8002c1
|
Web: Files : Added new folders icons
|
2020-11-12 14:46:20 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
|
|
5e30eb54e7
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-12 14:26:11 +03:00 |
|
|
|
30da7208d7
|
Web: Files: added thirdParty panel to tree, refactoring
|
2020-11-12 14:26:02 +03:00 |
|
Ilya Oleshko
|
a89740f362
|
Web: Files : Body : Fixed shared button indication
|
2020-11-12 13:42:40 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
97d9d58a29
|
Web: Files: added header loader
|
2020-11-12 13:30:54 +03:00 |
|
Ilya Oleshko
|
6f24bbf5da
|
Web: Files : Body : Fixed context options
|
2020-11-12 12:30:30 +03:00 |
|
|
|
45caaf23bf
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-12 12:01:34 +03:00 |
|
Ilya Oleshko
|
d70ca7a1d3
|
Web: Files : Body : Fixed props of tile view
|
2020-11-12 11:33:25 +03:00 |
|
|
|
73268462cb
|
Web: Files: added service icons
|
2020-11-12 11:25:48 +03:00 |
|
Ilya Oleshko
|
4b8a8c02c7
|
Web: Files : Body : Fixed displaying for connected items
|
2020-11-12 11:08:29 +03:00 |
|
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
SuhorukovAnton
|
9039c810c5
|
x-www-form-urlencoded: fix
|
2020-11-11 18:36:58 +03:00 |
|
|
|
e9a632d035
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-11 18:10:39 +03:00 |
|
Viktor Fomin
|
d2a30544d6
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-11 17:38:10 +03:00 |
|
Viktor Fomin
|
91bc88ad28
|
Update yarn.lock files
|
2020-11-11 17:37:48 +03:00 |
|
Viktor Fomin
|
2cc252c2ae
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 16:42:22 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +03:00 |
|
Viktor Fomin
|
40e2d85dbd
|
Update yarn.lock files
|
2020-11-11 13:27:17 +03:00 |
|
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
|
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 |
|
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
|
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
|
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 |
|
|
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
|
|
15134f2beb
|
Web: Files: added setting thirdParty page with translations
|
2020-11-06 12:14:02 +03:00 |
|
