Commit Graph

1200 Commits

Author SHA1 Message Date
TatianaLopaeva
91f09ed700 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-12-23 11:01:34 +03:00
f42fc72cf9 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-17 21:03:48 +03:00
326d234773 Update yarn.lock files 2020-12-17 18:35:04 +03:00
Vladislav Makhov
e58e0c927b web: files: select input value, when edit or create item 2020-12-17 17:46:53 +03:00
Vladislav Makhov
77ed5dd81e Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 17:21:33 +03:00
Vladislav Makhov
d195ca0a08 web: files: add toasts for delete operations 2020-12-17 16:12:32 +03:00
b96d62d72f Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3 2020-12-17 15:50:00 +03:00
0f1a43e0e7 Web: Files: fixed file read mark bug 2020-12-17 15:49:51 +03:00
Ilya Oleshko
3b31cd3248 Web: Files : Home: Fixed displaying context options for visitors 2020-12-17 15:20:52 +03:00
Vladislav Makhov
1e83731fbf Add translations 2020-12-17 15:20:51 +03:00
Alexey Kostenko
fb2b591603 Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 14:54:24 +03:00
Alexey Kostenko
159f8f9057 Web: Files: NewFilesPanel: Fixed styles 2020-12-17 13:34:07 +03:00
TatianaLopaeva
14e1d55ef9 Web: Files: Deleted debugger. 2020-12-17 13:18:34 +03:00
Ilya Oleshko
23cfe2032e Web: Files : Home: Fixed displaying shared buttons on share items 2020-12-17 13:09:53 +03:00
TatianaLopaeva
a7e4d814da Web: Common: Fixed unlocking by clicking on the icon. 2020-12-17 13:06:28 +03:00
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
Vladislav Makhov
61aa6ac875 web: files: add toasts for item creation 2020-12-17 11:53:08 +03:00
Vladislav Makhov
3ebbeb1ffc web: files: fix selection after rename item 2020-12-17 11:21:40 +03:00
41bca489bb Fixed versions (About version) 2020-12-16 19:09:56 +03:00
Alexey Kostenko
59e0105bb6 Web: Files: NewFilesPanel: Fixed row style 2020-12-16 17:01:17 +03:00
Alexey Kostenko
0932517a57 Web: Files: NewFilesPanel: Fixed style 2020-12-16 16:07:21 +03:00
Artem Tarasov
91bce60705 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-15 16:33:01 +03:00
TatianaLopaeva
eb0743a3ad Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page. 2020-12-15 14:08:14 +03:00
TatianaLopaeva
0dd8f2858a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-12-14 21:30:39 +03:00
Artem Tarasov
a0f5261576 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-14 20:59:14 +03:00
TatianaLopaeva
0c615d470b Web: Took the information about the width of the window from the store 2020-12-14 19:50:54 +03:00
Ilya Oleshko
8fd87415fd Web: Files : Home: Fixed downloading action 2020-12-14 18:21:45 +03:00
ca9e7bd58a Web: Files: Fixed resize window 2020-12-14 15:11:34 +03:00
f232625ca4 Web: Files: Extended error toast 2020-12-14 14:57:18 +03:00
b1ad327e1c Web: Files: Fixed blocking popup on file creation by Enter in FF 2020-12-14 14:09:33 +03:00
697ef7ed69 Web: Files: Refactoring of DocEditor page 2020-12-14 10:56:39 +03:00
c1c922f176 Web: Files: Removed useless api methods calls on DocEditor page 2020-12-14 10:54:27 +03:00
cc4fa01479 Web: Files: Removed displaying NavMenu loader on editor page 2020-12-14 10:51:58 +03:00
ca26adf8e2 Web: Files: fixed onEditComplete 2020-12-11 17:21:38 +03:00
6e0dd74e3e Merge branch 'release/v0.0.2' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into release/v0.0.2 2020-12-11 15:41:34 +03:00
0d7636d321 Web: Files: fixed dowload as 2020-12-11 15:41:16 +03:00
TatianaLopaeva
aa6eebb51b Web: Files/People: Home: Fixed the displaying load of section header 2020-12-11 14:21:37 +03:00
Ilya Oleshko
43346003fc Web: Files : Actions: Fixed wrong method on finish operation 2020-12-11 11:54:10 +03:00
TatianaLopaeva
c9a8027ddf Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Components/package.json
2020-12-11 11:12:28 +03:00
Ilya Oleshko
902cf95094 Web: Files : Home: Fixed action duplication on row 2020-12-11 10:17:25 +03:00
Artem Tarasov
72a21a1def Merge branch 'develop' into bugfix/dropdown-fix 2020-12-10 20:46:24 +03:00
Artem Tarasov
e6dfb13d7d Web: Common/Components/Files: applied isAside prop for backdrop, fixed related bugs 2020-12-10 20:09:16 +03:00
8c4be9ab6d Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation 2020-12-10 19:15:44 +03:00
2548dba9b7 Web: Files: Fixed opening file on external link 2020-12-10 19:15:36 +03:00
356ace1c57 Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:14:58 +03:00
bd8d8c6a14 Merge branch 'bugfix/upload-with-convertation' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into bugfix/upload-with-convertation 2020-12-10 19:01:01 +03:00
72dd4c6bad Web: Files: fixed article width 2020-12-10 19:00:44 +03:00
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
4c9db8c0cb Web: Files: COMMENTED conversation functional 2020-12-10 18:24:19 +03:00
Viktor Fomin
d7d14b1bd2 Web: Common: show alert if convert error 2020-12-10 16:14:28 +03:00