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 |
|
|
|
572a983350
|
Merge pull request #154 from ONLYOFFICE/hotfix/v0.0.3
Hotfix/v0.0.3
|
2020-12-17 20:57:19 +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 |
|
Artem Tarasov
|
bbea13bb4b
|
Web: Client: Confirm: changePassword fix
|
2020-12-17 19:49:20 +03:00 |
|
|
|
0e66177470
|
Files: refactoring
|
2020-12-17 19:39:31 +03:00 |
|
Artem Tarasov
|
51d07b5652
|
Web: Client: Confirm: refactoring
|
2020-12-17 19:37:52 +03:00 |
|
Artem Tarasov
|
68d6c1872f
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 19:28:24 +03:00 |
|
Artem Tarasov
|
5542a09575
|
Web: Clietn: Confirm: fixed redirect (changePassword)
|
2020-12-17 19:27:56 +03:00 |
|
|
|
326d234773
|
Update yarn.lock files
|
2020-12-17 18:35:04 +03:00 |
|
|
|
fb571c3ae6
|
web: common: bump version
|
2020-12-17 18:22:37 +03:00 |
|
|
|
3f553f6430
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 18:21:55 +03:00 |
|
|
|
76b04db830
|
Web: Common: Added VerstionBadge "Beta"
|
2020-12-17 18:21:48 +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 |
|
Artem Tarasov
|
9943d2c2ca
|
web: common: bump version
|
2020-12-17 16:26:35 +03:00 |
|
Artem Tarasov
|
fceb96c386
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 16:21:18 +03:00 |
|
Artem Tarasov
|
e0478dd2b3
|
web: common: bump version
|
2020-12-17 16:21:06 +03:00 |
|
Artem Tarasov
|
7851635005
|
Web: Client: Confirm: fix change password
|
2020-12-17 16:20:53 +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
|
3d29d75f2a
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 15:21:09 +03:00 |
|
Alexey Kostenko
|
e6d5c38059
|
web: common: bump version
|
2020-12-17 15:22:19 +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 |
|
Alexey Kostenko
|
86ef386d1b
|
web: common: bump version
|
2020-12-17 14:54:15 +03:00 |
|
Alexey Kostenko
|
b62695dc59
|
Web: Common: MediaViewer: Title style fix
|
2020-12-17 14:54:05 +03:00 |
|
Artem Tarasov
|
63c01a7ff6
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 14:50:32 +03:00 |
|
Artem Tarasov
|
cacfabdd04
|
web: common: bump version
|
2020-12-17 14:49:52 +03:00 |
|
Artem Tarasov
|
16d738e5ca
|
Web: Common/Client: changePassword: added logout if user is logged in
|
2020-12-17 14:49:30 +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 |
|
Artem Tarasov
|
403070777b
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 12:38:32 +03:00 |
|
Artem Tarasov
|
3daee8efbb
|
Web: Client: Confirm: fixed api method call
|
2020-12-17 12:38:23 +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 |
|
|
|
770d912625
|
Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3
|
2020-12-17 12:36:26 +03:00 |
|
|
|
2b766b2862
|
Web: People: fixed Row checkedProps
|
2020-12-17 12:36:02 +03:00 |
|
Artem Tarasov
|
28b047e93c
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 12:34:02 +03:00 |
|
