Commit Graph

8484 Commits

Author SHA1 Message Date
Artem Tarasov
006ac1bb19 Update yarn.lock files 2020-11-11 16:16:30 +03:00
Artem Tarasov
bcd4744798 web: components: bump version 2020-11-11 16:05:34 +03:00
Artem Tarasov
252f0d9bde Web: Components: aside: fixed transform: translateX 2020-11-11 15:42:45 +03:00
503d2c1948 fix loginproviders 2020-11-11 15:21:15 +03:00
dbe2ca72c1
Merge pull request #122 from ONLYOFFICE/feature/oauth
Feature/oauth
2020-11-11 12:30:29 +03:00
6c5728a1cb Merge branch 'develop' into feature/oauth 2020-11-11 12:14:05 +03:00
09c07e5060 Api: ThirdPartyController 2020-11-11 12:11:44 +03:00
9aba8ec982
Merge pull request #120 from ONLYOFFICE/hotfix/documents-bugfix
Hotfix/documents bugfix
2020-11-10 14:52:52 +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
ccf8eb8e59
Merge pull request #118 from ONLYOFFICE/feature/third-party-settings
Feature/third party settings
2020-11-10 10:51:01 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Vladislav Makhov
633a5415c0 Fix url 2020-11-10 08:14:56 +03:00
Artem Tarasov
2f19e504aa Web: Components: refactoring css rule, deleted incorrect description 2020-11-09 19:02:40 +03:00
Ilya Oleshko
d169eeac26
Merge pull request #121 from ONLYOFFICE/feature/creating-redirect
Feature/creating redirect
2020-11-09 19:01:46 +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
Vladislav Makhov
0df2b1e956 web: common: bump version 2020-11-09 18:48:08 +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
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +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
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
Vladislav Makhov
21234d6a39 Remove unused data 2020-11-09 16:24:32 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
Vladislav Makhov
7c6d5a9e54 Add translation 2020-11-09 15:58:58 +03:00
Vladislav Makhov
8ac2ad73d6 Fix title 2020-11-09 15:31:24 +03:00
Vladislav Makhov
cdaa816b36 Fix Help center link 2020-11-09 15:27:07 +03:00
Artem Tarasov
46ed4741a6 Web: Files/Components: deleted console.log, unusing code, refactoring 2020-11-09 15:23:20 +03:00
Artem Tarasov
11d91fe21f Web: Files/Components: tree-menu: fixed selection 2020-11-09 15:16:15 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Vladislav Makhov
eeced56986 Refactoring 2020-11-09 13:03:18 +03:00
Artem Tarasov
c2dfeb591c web: common: bump version 2020-11-09 12:43:27 +03:00
Artem Tarasov
9aedb02748 web: components: bump version 2020-11-09 12:43:20 +03:00
Artem Tarasov
4482f70cd3 Web: Files: VersionHistory: added arrow-button in header 2020-11-09 12:42:41 +03:00
Artem Tarasov
3c557194df Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows 2020-11-09 12:38:35 +03:00
Artem Tarasov
9805c086fe Web: Components: groups-button-menu: fixed position when viewed from desktop 2020-11-09 12:24:40 +03:00
Artem Tarasov
fa8e8341e2 Web: Components/Files: fixed warrnings 2020-11-09 12:11:08 +03:00
Vladislav Makhov
430c7ae73d Remove unused code 2020-11-09 12:05:17 +03:00
Vladislav Makhov
d569e8dd74 Refactoring 2020-11-09 12:02:03 +03:00
Artem Tarasov
1bd3db6a17 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-09 11:21:34 +03:00
Artem Tarasov
f9ea759a26 Web: Components: Row: fixed position share btn 2020-11-09 11:19:21 +03:00
Vladislav Makhov
102837ed04 Add selector 2020-11-09 09:16:44 +03:00
Vladislav Makhov
d4f2c16140 Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings 2020-11-06 19:18:42 +03:00
Vladislav Makhov
6f38b66255 Add react-string-format lib 2020-11-06 19:18:32 +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