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 |
|
|
|
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 |
|
Artem Tarasov
|
e3ae7df15e
|
Web: Files: VersionHistory: added fileId to store
|
2020-11-13 15:34:18 +03:00 |
|
Artem Tarasov
|
e558a9a6ab
|
Web: Files: VersionHistory: added prop visibilityVersionHistoryPanel to redux
|
2020-11-13 14:51:48 +03:00 |
|
Artem Tarasov
|
60404c326a
|
Web: Files: VersionHistoryPanel: refactoring
|
2020-11-13 14:26:14 +03:00 |
|
Artem Tarasov
|
ca4c71f714
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-13 14:00:30 +03:00 |
|
Artem Tarasov
|
31a6f65e06
|
Web: Files: VersionHistory: getting culture moved to VersionRow
|
2020-11-13 13:58:58 +03:00 |
|
|
|
47020b7a01
|
Merge pull request #117 from ONLYOFFICE/feature/filter-loader
Feature/files loader
|
2020-11-13 13:29:20 +03:00 |
|
Artem Tarasov
|
17c019304b
|
Web: Files: VersionHistoryPanel: fixed styles
|
2020-11-13 11:45:13 +03:00 |
|
Artem Tarasov
|
a38abc4ff4
|
Web: Fieles: VersionHistoryPanel: styled refactoring
|
2020-11-13 11:07:01 +03:00 |
|
Artem Tarasov
|
95a6f2ea47
|
Web: Files: VersionHistory: fixed render MainButton
|
2020-11-13 11:04:12 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +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 |
|
Viktor Fomin
|
f66fc4c7ba
|
Web: Client: fix
|
2020-11-12 14:36:42 +03:00 |
|
Artem Tarasov
|
d0da8d15bd
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-12 14:27:40 +03:00 |
|
Artem Tarasov
|
ed2fa1260d
|
Web: Files: VersionHistoryPanel: fixed styles
|
2020-11-12 14:25:52 +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 |
|
Artem Tarasov
|
f35effd715
|
Web: Files: VersionHistory: refactoring
|
2020-11-12 11:10:36 +03:00 |
|
Artem Tarasov
|
17ea8c98cd
|
Web: Common: PageLayout: added props headerBorderBottom
|
2020-11-12 11:09:17 +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 |
|
Viktor Fomin
|
80cdbe643e
|
Web: Common: delete loader box
|
2020-11-12 00:42:14 +03:00 |
|
Viktor Fomin
|
a801fcb603
|
Web: Common: fix logo loading
|
2020-11-12 00:32:40 +03:00 |
|
Viktor Fomin
|
3dc69fc9e8
|
Web: People: added group loader
|
2020-11-12 00:12:28 +03:00 |
|
Viktor Fomin
|
e52c7d45b2
|
Web: Common: export group loader
|
2020-11-12 00:12:12 +03:00 |
|
Viktor Fomin
|
e7e8c6cb88
|
Web: Common: created group loader
|
2020-11-12 00:10:41 +03:00 |
|
Viktor Fomin
|
45e9ab5aea
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 23:26:03 +03:00 |
|
|
|
7ad7cab1d3
|
Merge pull request #123 from ONLYOFFICE/hotfix/section-loader
Hotfix/section loader
|
2020-11-11 22:19:04 +03:00 |
|
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
