Commit Graph

8843 Commits

Author SHA1 Message Date
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
141165903b Test: fix 2020-11-16 17:58:27 +03:00
c7ff6e4af5
Merge pull request #126 from ONLYOFFICE/refactoring/scope
Refactoring/scope
2020-11-16 17:22:08 +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
Alexey Kostenko
c58d720db2 web: common: bump version 2020-11-16 09:05:54 +03:00
Alexey Kostenko
4b2848d639 Web: Common: FilterInput: Fixed bug with reset sorting 2020-11-16 08:10:07 +03:00
f328484bac Thumbnails: updated winston 2020-11-15 18:42:47 +03:00
7c228a78e5 Files: fix create file in thirdparty 2020-11-15 18:34:47 +03:00
2c85229d8b Web: Files: fixed ThirdParty icons styles 2020-11-13 18:54:54 +03:00
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
47020b7a01
Merge pull request #117 from ONLYOFFICE/feature/filter-loader
Feature/files loader
2020-11-13 13:29:20 +03:00
67507d707d Web: Files: fixed remove services 2020-11-13 11:48:42 +03:00
Alexey Kostenko
bfecfc31d3 web: common: bump version 2020-11-13 10:58:50 +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
Alexey Kostenko
969f7e5c4f Web: Common: FilterInput: Refactoring 2020-11-13 10:26:14 +03:00
335f4f2fe7
Merge pull request #119 from ONLYOFFICE/bugfix/x-www-form-urlencoded
Bugfix/x www form urlencoded
2020-11-13 10:08:33 +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
Ilya Oleshko
8a2259f47b Web: People : Profile : Fixed focus issue on devices 2020-11-12 18:25:18 +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
Viktor Fomin
02081905e8 web: common: bump version 2020-11-12 15:01:46 +03:00
Viktor Fomin
2df7830782 Web: Common: fix unauth logo loader 2020-11-12 15:01:38 +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
Viktor Fomin
f66fc4c7ba Web: Client: fix 2020-11-12 14:36:42 +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
Alexey Kostenko
9d6ad1538e Web: Common: FilterInput: Fixed warning 2020-11-12 14:18:36 +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
5ef5ea5d0c web: common: bump version 2020-11-12 13:32:37 +03:00
Viktor Fomin
9a7237aea0 Web: Client: added header loader 2020-11-12 13:31:48 +03:00
Viktor Fomin
0bb00e39db Web: People: added header loader 2020-11-12 13:31:19 +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
296901f7a8 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2020-11-12 11:57:35 +03:00
5adde516e8 Thirdparty: fix 2020-11-12 11:56:27 +03:00
Alexey Kostenko
baa81cc6d0 Web: Common: FilterInput: Fixed bug when selecting an option 2020-11-12 11:47:34 +03:00
Ilya Oleshko
7abb7e8951 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2020-11-12 11:33:55 +03:00
Ilya Oleshko
d70ca7a1d3 Web: Files : Body : Fixed props of tile view 2020-11-12 11:33:25 +03:00
c93a923e29 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2020-11-12 11:28:01 +03:00