Commit Graph

9406 Commits

Author SHA1 Message Date
Viktor Fomin
044766273f Web: Common: changed progress bar to floating button 2020-11-17 14:22:36 +03:00
Artem Tarasov
8d5f8b6be9 web: common: bump version 2020-11-17 11:56:45 +03:00
Artem Tarasov
09986bc929 web: components: bump version 2020-11-17 11:56:36 +03:00
Artem Tarasov
efacc50ac4 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-17 11:48:55 +03:00
Artem Tarasov
900fc894fe Web: Files: VersionHistory: refactoring 2020-11-17 11:47:00 +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
Viktor Fomin
e51c7d2dd4 Update yarn.lock files 2020-11-16 18:56:12 +03:00
Viktor Fomin
635b7a8beb web: common: bump version 2020-11-16 18:50:49 +03:00
Viktor Fomin
705bcb1117 web: components: bump version 2020-11-16 18:50:41 +03:00
Viktor Fomin
35b8c42685 Web: Common: refactoring, add percent props 2020-11-16 18:49:54 +03:00
Viktor Fomin
94e875075d Web: Common: fixed styles 2020-11-16 18:49:06 +03:00
141165903b Test: fix 2020-11-16 17:58:27 +03:00
Artem Tarasov
06d9d2500a Web: Common: PageLayout: deleted console.log 2020-11-16 17:51:00 +03:00
Artem Tarasov
8d56195705 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-16 17:35:43 +03:00
Artem Tarasov
fe5de62a3b Web: Files: VersionHistory: fixed filter reset after returning from the VersionHistory padge 2020-11-16 17:34:17 +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
Artem Tarasov
7f1387410c Web: Files: VersionHistory: refactorung 2020-11-16 16:46:00 +03:00
Artem Tarasov
dde9fcf285 Web: Common: Loaders.HistroyRows: fixed styles 2020-11-16 16:39:36 +03:00
Artem Tarasov
af8a8ba77b Web: Files: VersionHistoryPanel: fixed render error 2020-11-16 15:38:57 +03:00
Artem Tarasov
52432308f9 Web: Files: VersionHistory: Loaders.HistoryRows component applied 2020-11-16 15:26:41 +03:00
Artem Tarasov
24f2603135 Web: Common: Loaders: added Loader for Version History page 2020-11-16 15:24:26 +03:00
Viktor Fomin
ea7eb2434f Web: Common: fix icon prop types 2020-11-16 14:58:11 +03:00
Viktor Fomin
745241277e Web: Common: added readme 2020-11-16 14:53:10 +03:00
Viktor Fomin
a36bd324cb Web: Common: created floating button stories 2020-11-16 14:48:10 +03:00
Viktor Fomin
a940797f7c Web: Common: created floating button 2020-11-16 14:47:30 +03:00
Viktor Fomin
9ab9204ce1 Web: Components: added new icons 2020-11-16 14:00:09 +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
Artem Tarasov
575f9af8aa Web: Files: VersionHistoryPanel: added propTypes 2020-11-13 15:48:52 +03:00
Artem Tarasov
144d1894c5 Web: Files: Deleted unusing var 2020-11-13 15:48:21 +03:00
Artem Tarasov
fa06fb84a6 Web: Files: VersionHistory: added redirect when following a direct link 2020-11-13 15:35:16 +03:00