Commit Graph

2812 Commits

Author SHA1 Message Date
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
2ebd7e882c Web: People: fix first loader 2020-11-10 18:20:56 +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
Viktor Fomin
a82551568b Web: People: fix props name 2020-11-10 17:30:43 +03:00
Artem Tarasov
02aed65d60 Web: Files: DocEditor: fixed of mobile view 2020-11-10 14:29:59 +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
Artem Tarasov
f578e43662 Web: Files: Settings: refactoring 2020-11-10 13:31:16 +03:00
4458bca039 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-10 11:21:34 +03:00
6947185bab Files: refactoring 2020-11-10 11:21:22 +03:00
Viktor Fomin
9cbe89d4b5
Merge branch 'develop' into feature/filter-loader 2020-11-10 11:02:29 +03:00
Viktor Fomin
834e8e6516 Update yarn.lock files 2020-11-10 10:46:26 +03:00
Viktor Fomin
8648abedbd Web: People: delete first header preloader 2020-11-10 10:40:33 +03:00
Viktor Fomin
067ee4fc5a Web: Files: delete first header preloader 2020-11-10 10:40:17 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Viktor Fomin
afd252e2ce Web: People: fix profile action loader 2020-11-10 03:08:59 +03:00
Viktor Fomin
515bd0d05f Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-09 23:02:18 +03:00
Viktor Fomin
a7dee56194 Update yarn.lock files 2020-11-09 23:01:57 +03:00
Viktor Fomin
9f19173195 Web: People: added circle in row 2020-11-09 22:57:02 +03:00
4dd9c6f554 Update yarn.lock files 2020-11-09 22:35:39 +03:00
d012aa6071 Merge branch 'develop' into feature/filter-loader
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-11-09 22:15:04 +03:00
Artem Tarasov
066140f388 Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal 2020-11-09 18:59:06 +03:00
Artem Tarasov
57ca2d2603 Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file 2020-11-09 18:33:45 +03:00
Ilya Oleshko
82a2520150 Web: Files : Body : Fixed preload tab for new documents 2020-11-09 18:29:06 +03:00
3c38343063 Fix download.
fix thirdparty
2020-11-09 17:46:49 +03:00
Viktor Fomin
6e8685d8d6 Update yarn.lock files 2020-11-09 16:54:13 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
Artem Tarasov
46ed4741a6 Web: Files/Components: deleted console.log, unusing code, refactoring 2020-11-09 15:23:20 +03:00
Viktor Fomin
b3f4bd3f64 Update yarn.lock files 2020-11-09 15:16:44 +03:00
Artem Tarasov
11d91fe21f Web: Files/Components: tree-menu: fixed selection 2020-11-09 15:16:15 +03:00
Viktor Fomin
33ef924307 Web: People: fix first loader 2020-11-09 15:11:04 +03:00
Viktor Fomin
7211978a38 Web: Files: fix first loader 2020-11-09 15:10:51 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
884cb67a35 Web: People: delete logo 2020-11-09 13:07:43 +03:00
Viktor Fomin
3c84424d8f Web: Files: delete logo 2020-11-09 13:07:27 +03:00
Artem Tarasov
4482f70cd3 Web: Files: VersionHistory: added arrow-button in header 2020-11-09 12:42:41 +03:00
Viktor Fomin
445b2e83b5 Web: People: delete loading label 2020-11-09 12:37:13 +03:00
Artem Tarasov
fa8e8341e2 Web: Components/Files: fixed warrnings 2020-11-09 12:11:08 +03:00
Artem Tarasov
1bd3db6a17 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-09 11:21:34 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
Artem Tarasov
43bb83692d Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix 2020-11-06 18:08:22 +03:00
37fa37f473 Files: fix autofac 2020-11-06 17:54:48 +03:00
Artem Tarasov
612661a22b Web: Files/Common: MainButton: fixed line-height 2020-11-06 16:43:14 +03:00
Artem Tarasov
9f46d7211f Web: Files: Settings: fixed key fot translations 2020-11-06 16:32:47 +03:00
Artem Tarasov
48c4f3b0f2 Web: VersionHistory: deleted unusing code 2020-11-06 16:22:58 +03:00
Artem Tarasov
b55246fbd9 Web: Files: fixed variable name isNeedSetViewBox -> needSetViewBox 2020-11-06 16:19:13 +03:00
Viktor Fomin
b1f9db662d Web: People: fix color 2020-11-06 16:17:56 +03:00
Viktor Fomin
1a4ced2195 Web: Files: fix color 2020-11-06 16:17:40 +03:00