Commit Graph

2838 Commits

Author SHA1 Message Date
7c228a78e5 Files: fix create file in thirdparty 2020-11-15 18:34:47 +03:00
Viktor Fomin
fc33f10e37
Merge branch 'develop' into feature/filter-loader 2020-11-13 10:30:09 +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
9890f1cc43 Update yarn.lock files 2020-11-12 13:37:13 +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
Viktor Fomin
3dc69fc9e8 Web: People: added group loader 2020-11-12 00:12:28 +03:00
Viktor Fomin
45e9ab5aea Merge branch 'develop' into feature/filter-loader 2020-11-11 23:26:03 +03:00
d8bd2b7d21 Update yarn.lock files 2020-11-11 22:03:47 +03:00
c4411f7b00
Merge branch 'develop' into hotfix/section-loader 2020-11-11 21:54:02 +03:00
SuhorukovAnton
9039c810c5 x-www-form-urlencoded: fix 2020-11-11 18:36:58 +03:00
Viktor Fomin
d2a30544d6 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-11 17:38:10 +03:00
Viktor Fomin
91bc88ad28 Update yarn.lock files 2020-11-11 17:37:48 +03:00
Viktor Fomin
2cc252c2ae
Merge branch 'develop' into feature/filter-loader 2020-11-11 16:42:22 +03:00
Artem Tarasov
006ac1bb19 Update yarn.lock files 2020-11-11 16:16:30 +03:00
Alexey Kostenko
63dad62226 Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page) 2020-11-11 15:46:46 +03:00
Alexey Kostenko
7a6a9b539b Web: People: Fixed loading of the main page when switching from a profile 2020-11-11 14:09:40 +03:00
Viktor Fomin
40e2d85dbd Update yarn.lock files 2020-11-11 13:27:17 +03:00
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
SuhorukovAnton
6e2860a7e5 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-10 14:51:33 +03:00
Artem Tarasov
02aed65d60 Web: Files: DocEditor: fixed of mobile view 2020-11-10 14:29:59 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +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