Commit Graph

1702 Commits

Author SHA1 Message Date
Alexey Kostenko
5fe44c3976 Web: Files/Common: Change access type to external link, refactoring, applied prettier style fix 2020-12-03 15:18:38 +03:00
Viktor Fomin
2482f12e3e Web: Files: fixed uploading files 2020-12-03 14:17:40 +03:00
155b23f799 Files: GetSecurityInfo 2020-12-02 16:17:43 +03:00
Alexey Kostenko
6be36a65cd Web: Files: SharingPanel: Changing access type external link by toggle button 2020-12-02 15:31:43 +03:00
Alexey Kostenko
541cedeb4f Web: Files: Revert local changes 2020-12-02 11:21:17 +03:00
Alexey Kostenko
23b209b85c Merge branch 'develop' into bugfix/sharing-settings 2020-12-02 09:14:36 +03:00
Alexey Kostenko
2f61c821bf Web: Files: Opening editor without authorization 2020-12-02 08:56:42 +03:00
303abad2a4 Files: change owner 2020-12-01 22:59:42 +03:00
Ilya Oleshko
eb2ae72026 Web: Files : Components: Hide logs 2020-12-01 17:19:07 +03:00
Viktor Fomin
86425fac97 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-01 16:31:17 +03:00
Viktor Fomin
0d1f1a4599 Update yarn.lock files 2020-12-01 16:26:13 +03:00
Viktor Fomin
133b1bfc39 Web: Files: fixed files uploading 2020-12-01 16:25:49 +03:00
Viktor Fomin
1c8b7115a5 Web: Common: fixed files uploading 2020-12-01 14:06:57 +03:00
f1f1ae818e Files: fix long operation 2020-12-01 12:29:08 +03:00
8de24eae99 Files: openedit. AllowAnonymous 2020-12-01 10:20:15 +03:00
6f76404eaa Files: optimization 2020-11-30 23:02:10 +03:00
Viktor Fomin
8c8475bd51 Web: Common: fixed percent calculation 2020-11-30 19:12:16 +03:00
Alexey Kostenko
7a95d4b942 Web: Files: Server: Added api setacelink 2020-11-30 18:34:45 +03:00
645749fbc7 Files: rename ParentFolderID to FolderId.
Optimization
2020-11-30 16:47:26 +03:00
Viktor Fomin
2c8b384ef1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-30 15:17:48 +03:00
Viktor Fomin
e49ac0fec7 Web: Files: added progress load 2020-11-30 15:15:59 +03:00
f10f6b8d3b Update yarn.lock files 2020-11-30 15:11:23 +03:00
Alexey Kostenko
e27400e573 Web: Files: SharingPanel: Added a template for setting up an external link 2020-11-30 09:33:35 +03:00
8c965fa4e1 Web: People: changed empty screen description, fixed icons alignment 2020-11-28 13:44:31 +03:00
Viktor Fomin
69b823ce46 Web: Files: fixed calculation new percent 2020-11-27 17:51:01 +03:00
12542c137c Remove todo 2020-11-27 17:06:26 +03:00
b4e071081c todo 2020-11-27 16:42:27 +03:00
95ba0185db Web: Files: fixed files row metadata 2020-11-26 17:07:43 +03:00
Alexey Kostenko
50ec9c371a Web: Files: SharingPanel: Added Disabling LinkRow 2020-11-26 16:25:47 +03:00
56fc822099 Web: Files: removed files row metadata 2020-11-26 15:11:44 +03:00
Alexey Kostenko
541a1bb8aa Web: Files: SharingPanel: Fixed internal/external links style 2020-11-26 14:53:48 +03:00
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +03:00
Alexey Kostenko
3a9dc6b1c8 Web: Files: SharingPanel: Refactoring, Added toggle button and dropDown to LinkRow 2020-11-25 17:03:48 +03:00
Alexey Kostenko
8a0c8957fd Web: Files: SharingPanel: Refactoring (function "linksFunction" is moved to a separate component) 2020-11-25 15:40:17 +03:00
Viktor Fomin
ebc7886762 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-25 14:57:56 +03:00
Viktor Fomin
3d8caa1f4d Update yarn.lock files 2020-11-25 14:57:17 +03:00
Viktor Fomin
1a1e9bef8e Web: Files: fixed alert 2020-11-25 14:37:07 +03:00
Viktor Fomin
d1bc59aad4 Web: Files: added alert 2020-11-25 13:50:05 +03:00
Alexey Kostenko
4d92a4499e Web: Files: SharingPanel: Fixed indents 2020-11-25 09:24:54 +03:00
Alexey Kostenko
437032a541 Merge branch 'develop' into bugfix/sharing-settings 2020-11-24 17:54:23 +03:00
Alexey Kostenko
9534f48a7d Web: Files/Components: Fixed combo-button (Enable click on icon) 2020-11-24 17:52:23 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
Alexey Kostenko
f2701388c2 Web: Files: SharingPanel: Fixed header styles 2020-11-24 06:58:20 +03:00
Viktor Fomin
c6a6b324e6 Update yarn.lock files 2020-11-23 14:20:52 +03:00
Viktor Fomin
26217ab4df Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-23 14:16:09 +03:00
Viktor Fomin
e3701e9aa2 Web: Files: put timeout in constant 2020-11-23 14:14:32 +03:00
Viktor Fomin
f92f1e6573 Web: Files: remove operation type 2020-11-23 12:59:13 +03:00
af77fa0f24
Merge branch 'develop' into bugfix/filter-fix 2020-11-20 16:19:52 +03:00
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
Viktor Fomin
7deaecc525 Update yarn.lock files 2020-11-20 15:36:14 +03:00
Viktor Fomin
8ffc4b4d4a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-20 15:35:59 +03:00
Alexey Kostenko
32b49a02c6 Web: Files: SharingPanel: fixed footer in add users/groups menu 2020-11-20 15:02:11 +03:00
Alexey Kostenko
d120621f65 Web: Files: SharingPanel: Fixed button styles 2020-11-20 14:38:16 +03:00
be081c45b6 Files: fixed share folder 2020-11-20 13:45:42 +03:00
Artem Tarasov
56d2286f63 Merge branch 'develop' into bugfix/filter-fix 2020-11-20 13:09:04 +03:00
b5a66444d7 Thirdparty: fix save 2020-11-20 12:24:17 +03:00
Viktor Fomin
2a175aedf4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-20 11:53:18 +03:00
0337bd58da Files: fixed DI 2020-11-20 10:22:15 +03:00
Viktor Fomin
ed21b37651 Web: Files: fixed cleaning secondary operations 2020-11-20 00:03:13 +03:00
2a222a94fc Thirdparty: fix save 2020-11-19 22:17:45 +03:00
5aef0e809e Files: fix get share 2020-11-19 21:48:16 +03:00
1ddb6804ed Files: fix share thirdparty 2020-11-19 21:47:40 +03:00
Viktor Fomin
11c4864e9c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-19 16:20:27 +03:00
Viktor Fomin
66945edc80 Update yarn.lock files 2020-11-19 16:19:05 +03:00
Viktor Fomin
9cd88443f2 Web: Files: fixed loaders, added second 2020-11-19 16:11:14 +03:00
Artem Tarasov
be094640fe Web: Files: Filter: fixed names of sorting items 2020-11-19 13:22:09 +03:00
2ceb845808 Thirdparty: fix copy 2020-11-19 11:30:00 +03:00
Viktor Fomin
a2e6e9cf25 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-18 18:00:28 +03:00
Viktor Fomin
c8f07b73bb Web: Files: icon display by operation type 2020-11-18 17:59:39 +03:00
Viktor Fomin
e6007dc302 Web: Files: fixed label on icon, returned label 2020-11-18 17:29:41 +03:00
93410996f0 Merge branch 'develop' into refactoring/files-thirdparty 2020-11-18 15:19:36 +03:00
2909d9d240 Thirdparty: refactoring security, tag 2020-11-18 13:37:11 +03:00
3c19fda2de Thirdparty: refactoring security 2020-11-18 11:28:43 +03:00
20d37596cf Files: fix share 2020-11-17 22:36:27 +03:00
0c520416fa Files: remove cache 2020-11-17 21:17:23 +03:00
f11a11d470 Thirdparty: refactoring 2020-11-17 17:56:36 +03:00
903abca3a8 Thirdparty: refactoring 2020-11-17 17:41:42 +03:00
1b03c87157 Thirdparty: refactoring 2020-11-17 17:08:54 +03:00
Viktor Fomin
34e361a329 Update yarn.lock files 2020-11-17 14:31:11 +03:00
Viktor Fomin
26c3558063 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-17 14:24:13 +03:00
Viktor Fomin
f212dc7ad9 Web: Files: changed progress bar to floating button 2020-11-17 14:23:14 +03:00
2c945b0414
Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-17 11:18:59 +03:00
121f34946b Files: added base "Only in TMFileDao" methods 2020-11-17 11:13:53 +03:00
Alexey Kostenko
3702bd597d Web: Common: Refactoring HOC withLayoutSize 2020-11-17 10:32:02 +03:00
Alexey Kostenko
c6d4b5bf60 Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-17 08:11:35 +03:00
Alexey Kostenko
e65f2b36c7 Web: Files: Filter: Changed Consumer to HOC 2020-11-17 06:33:34 +03:00
7866ba1212 Files: removed dependencies 2020-11-16 21:30:33 +03:00
77fec89a0f Files: DotNetZip replaced with SharpCompress 2020-11-16 19:41:14 +03:00
Viktor Fomin
e51c7d2dd4 Update yarn.lock files 2020-11-16 18:56:12 +03:00
cd523404f1 Merge branch 'develop' into refactoring/scope 2020-11-16 17:09:19 +03:00
Alexey Kostenko
af8ce86d2d Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-16 12:36:55 +03:00
7c228a78e5 Files: fix create file in thirdparty 2020-11-15 18:34:47 +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
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
2ec76cae70 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-12 18:03:10 +03:00
Viktor Fomin
4c398104cb Update yarn.lock files 2020-11-12 15:06:18 +03:00
Alexey Kostenko
913c45a00b Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-12 14:40:46 +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
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
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
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
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
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
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
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
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