Commit Graph

1536 Commits

Author SHA1 Message Date
Viktor Fomin
9cd88443f2 Web: Files: fixed loaders, added second 2020-11-19 16:11:14 +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