Commit Graph

8766 Commits

Author SHA1 Message Date
Alexey Kostenko
150d98fb89 Web: Common: Fixed warning 2020-11-17 14:55:39 +03:00
Alexey Kostenko
d86304ff48 Web: Components: Added unsubscribe from events when unmounting a component 2020-11-17 14:55:39 +03:00
Alexey Kostenko
c9f7e22fcf Web: Common/Components: Fixed typo 2020-11-17 14:55:39 +03:00
d6c58eb49c
Merge pull request #125 from ONLYOFFICE/hotfix/filter-input-hotfix
Hotfix/filter input hotfix
2020-11-17 11:31:06 +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
f37d40442f
Merge pull request #128 from ONLYOFFICE/feature/files-zip
Feature/files zip
2020-11-17 11:09:14 +03:00
Alexey Kostenko
a46806ae24 web: common: bump version 2020-11-17 10:32:14 +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
ee26c7c148 web: common: bump version 2020-11-17 08:11:11 +03:00
Alexey Kostenko
8db2b5b3d0 Web: Common: Code cleaning 2020-11-17 08:05:47 +03:00
Alexey Kostenko
99ae4dba20 Web: People: Changed Consumer to HOC 2020-11-17 06:39:08 +03:00
Alexey Kostenko
e65f2b36c7 Web: Files: Filter: Changed Consumer to HOC 2020-11-17 06:33:34 +03:00
Alexey Kostenko
32e633cee9 Web: Common: Added HOC withLayoutSize 2020-11-17 06:29:24 +03:00
fda6d3cdc5 Merge branch 'develop' into feature/files-zip 2020-11-16 21:38:00 +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
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
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
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
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
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
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
Alexey Kostenko
9d6ad1538e Web: Common: FilterInput: Fixed warning 2020-11-12 14:18:36 +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
Alexey Kostenko
baa81cc6d0 Web: Common: FilterInput: Fixed bug when selecting an option 2020-11-12 11:47:34 +03:00
Alexey Kostenko
366989ea9c Web: People: Added sectionWidth prop to filterInput 2020-11-12 11:23:08 +03:00
Alexey Kostenko
2779c12db9 Web: Common: Fixed hiding/adding filter items 2020-11-12 11:13:12 +03:00
Viktor Fomin
4d34d8c964 Web: Common: fix header loader in nav menu 2020-11-12 02:26:21 +03:00
Viktor Fomin
9303703685 Web: Common: fix header loader 2020-11-12 02:25:34 +03:00