Commit Graph

3137 Commits

Author SHA1 Message Date
Artem Tarasov
bfd11ede79 Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
2020-12-21 13:15:43 +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
0ca5402bc6 Files: fixed new tag 2020-12-17 20:50:54 +03:00
TatianaLopaeva
def290f8eb Web: People: Fixed displaying of header (Android). 2020-12-17 20:16:26 +03:00
0e66177470 Files: refactoring 2020-12-17 19:39:31 +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
de4e0de1ed Web: People: remove useless console.log from ProfileInfo 2020-12-17 17:40:10 +03:00
3b94449d03 Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3 2020-12-17 17:37:33 +03:00
42a496f442 Web: People: removed componentDidMount from filter, fixed profile group select 2020-12-17 17:37:22 +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
10cc974edf Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3 2020-12-17 15:17:43 +03:00
9da7eb90b0 Web: People: fixed minDate, maxDate to profile dates 2020-12-17 15:17:32 +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
6d1f0dbba8 Files: fixed flag "new" 2020-12-17 14:24:31 +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
c573e23b0b Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 12:37:41 +03:00
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
2b766b2862 Web: People: fixed Row checkedProps 2020-12-17 12:36:02 +03:00
Ilya Oleshko
2fe145d556 Web: People : Home : Fixed group menu out of screen 2020-12-17 12:19:18 +03:00
d849ac9c38 Web: People: Fixed empty phone and password inputs in ProfileAction 2020-12-17 12:08:57 +03:00
Vladislav Makhov
61aa6ac875 web: files: add toasts for item creation 2020-12-17 11:53:08 +03:00
Vladislav Makhov
b75316387b Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 11:21:50 +03:00
Vladislav Makhov
3ebbeb1ffc web: files: fix selection after rename item 2020-12-17 11:21:40 +03:00
91a9255bbc Web: People: fixed access to action menu 2020-12-17 11:11:12 +03:00
bc2bea064f Web: People: added minDate to DatePicker 2020-12-17 11:09:44 +03:00
02698ae515 Web: People: fixed GroupAction translations 2020-12-17 11:06:46 +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
334c766052 Dao: any replaced with containts 2020-12-16 15:03:43 +03:00
Artem Tarasov
78523a8d96 Merge branch 'develop' into bugfix/dropdown-fix 2020-12-15 15:39:22 +03:00
b0dd9c1400 Files: optimization 2020-12-15 13:29:53 +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
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