|
d00d13bb8f
|
Core: fix
|
2020-12-11 13:03:30 +03:00 |
|
|
fa7d8e2010
|
Merge branch 'develop' into release/v0.0.2
|
2020-12-11 13:02:11 +03:00 |
|
Ilya Oleshko
|
acf5456b0c
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-11 12:49:14 +03:00 |
|
|
156bf72046
|
Core: fix GetProperty
|
2020-12-11 12:48:21 +03:00 |
|
Vladislav Makhov
|
25d43785d6
|
Replace number of root folder type id with constant
|
2020-12-11 12:09:16 +03:00 |
|
Vladislav Makhov
|
217a937b1e
|
Hide new items notification in private room, then not in desktop
|
2020-12-11 12:06:22 +03:00 |
|
Ilya Oleshko
|
43346003fc
|
Web: Files : Actions: Fixed wrong method on finish operation
|
2020-12-11 11:54:10 +03:00 |
|
Artem Tarasov
|
1b825e4cfa
|
Web: Common: PageLayout: fixed condition for trigger stopping if current element is undefined
|
2020-12-11 11:54:07 +03:00 |
|
|
0a775abb82
|
Files: optimization
|
2020-12-11 11:46:41 +03:00 |
|
|
f70e6e907f
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-11 11:34:23 +03:00 |
|
Artem Tarasov
|
eaa436f28f
|
Web: Components: backdrop: fixed class name
|
2020-12-11 10:20:42 +03:00 |
|
Ilya Oleshko
|
902cf95094
|
Web: Files : Home: Fixed action duplication on row
|
2020-12-11 10:17:25 +03:00 |
|
|
169c25d9bb
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-12-11 10:04:19 +03:00 |
|
Ilya Oleshko
|
49388675e9
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-11 09:39:12 +03:00 |
|
Artem Tarasov
|
b49c41929b
|
web: components: bump version
|
2020-12-10 20:49:27 +03:00 |
|
Artem Tarasov
|
7d5cb10068
|
web: common: bump version
|
2020-12-10 20:49:11 +03:00 |
|
Artem Tarasov
|
82e3e35cd4
|
Web: Common: PageLayoyt: deleted console.log
|
2020-12-10 20:48:58 +03:00 |
|
Artem Tarasov
|
72a21a1def
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-10 20:46:24 +03:00 |
|
Artem Tarasov
|
7fbe85b318
|
Web: Common: PageLayout: fixed application crash after calling the context menu with right button and then clicking on the backdrop
|
2020-12-10 20:23:49 +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 |
|
Artem Tarasov
|
48f782b6bc
|
Web: Common/Components: removed unnecessary DOM requests
|
2020-12-10 20:06:04 +03:00 |
|
|
cd72aa3d12
|
Merge pull request #150 from ONLYOFFICE/bugfix/upload-with-convertation
Bugfix/upload with convertation
|
2020-12-10 19:51:52 +03:00 |
|
Artem Tarasov
|
c8aad2f2d2
|
Web: Components: context-menu: added prop withBackdrop, tests
|
2020-12-10 19:42:59 +03:00 |
|
Artem Tarasov
|
5510487db8
|
Web: Components: dropdown: added backdrop, new props, tests
|
2020-12-10 19:41:42 +03:00 |
|
Artem Tarasov
|
83bfa3ed06
|
Web: Components: backdrop: backdrop rendering conditions changed
|
2020-12-10 19:40:23 +03:00 |
|
|
b0617ac111
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:35:51 +03:00 |
|
|
2f9cacfd8f
|
Merge pull request #148 from ONLYOFFICE/bugfix/toast
Bugfix/toast
|
2020-12-10 19:34:32 +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 |
|
|
b85faae56b
|
Web: Common: fixed filter update
|
2020-12-10 18:41:42 +03:00 |
|
|
be497b0f3a
|
web: common: bump version
|
2020-12-10 18:38:49 +03:00 |
|
|
419fe93913
|
Merge branch 'develop' into bugfix/toast
|
2020-12-10 18:37:17 +03:00 |
|
|
4c9db8c0cb
|
Web: Files: COMMENTED conversation functional
|
2020-12-10 18:24:19 +03:00 |
|
Vladislav Makhov
|
4110da78fa
|
Prevent adding file to recently viewed in private room
|
2020-12-10 17:25:29 +03:00 |
|
Ilya Oleshko
|
5906b2f914
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-12-10 16:25:44 +03:00 |
|
Viktor Fomin
|
d7d14b1bd2
|
Web: Common: show alert if convert error
|
2020-12-10 16:14:28 +03:00 |
|
Ilya Oleshko
|
2055f56e0f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-10 15:54:37 +03:00 |
|
|
dff5391b68
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-10 15:07:14 +03:00 |
|
|
78b7cb609a
|
Merge pull request #149 from ONLYOFFICE/bugfix/header-fix
Bugfix/header fix
|
2020-12-10 14:59:51 +03:00 |
|
|
1a1417e20a
|
Web: Files: fixed share link access rights
|
2020-12-10 14:46:57 +03:00 |
|
Alexey Kostenko
|
3e448ce90e
|
web: common: bump version
|
2020-12-10 14:27:47 +03:00 |
|
Alexey Kostenko
|
ea3f287acb
|
Web: Common: Removed unused prop
|
2020-12-10 14:25:51 +03:00 |
|
Ilya Oleshko
|
d61691fe22
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-10 14:01:13 +03:00 |
|
Alexey Kostenko
|
abda53a082
|
Web: Files/People/Common: Fixed header styles
|
2020-12-10 13:31:53 +03:00 |
|
|
a562631c3e
|
Web: Files: removed useless code from sharing panel
|
2020-12-10 12:26:09 +03:00 |
|
|
82b6bc57bc
|
Web: Files: moved advancedOptions to AccessComboBox
|
2020-12-10 12:14:34 +03:00 |
|