Commit Graph

1515 Commits

Author SHA1 Message Date
cbb0c75492 Web: Common: added employeeStatus to PeopleSelector 2020-12-16 11:37:50 +03:00
e542f2b54e Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-15 17:59:18 +03:00
4027ca9599 Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-15 10:56:50 +03:00
Artem Tarasov
59f80038e4 web: common: bump version 2020-12-15 10:11:30 +03:00
Artem Tarasov
287be4e83f web: common: bump version 2020-12-15 10:11:21 +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
f43a2562dd web: common: bump version 2020-12-14 18:41:53 +03:00
Ilya Oleshko
bdb433ae35 Web: Common : Api: Fixed default filter sort order 2020-12-14 18:41:44 +03:00
45001f0dcf Web: Common: added owner change api 2020-12-14 15:07:27 +03:00
15420cb96b Web: Files: fixed ShareAccessRights constants 2020-12-14 15:06:24 +03:00
TatianaLopaeva
89f5cb670c web: common: bump version 2020-12-11 18:44:44 +03:00
TatianaLopaeva
0657447229 Web: Common: PageLayout: Added maximum width when loading an article (tablet/mobile) 2020-12-11 18:44:35 +03:00
Artem Tarasov
8ae9dd0df7 Web: Common: FilterInput: fixed z-index for backdrop when HideFilter is displayed 2020-12-11 17:16:11 +03:00
Alexey Kostenko
a20af486ad web: common: bump version 2020-12-11 16:00:06 +03:00
Alexey Kostenko
3340786838 Web: Common: FilterInput: Fixed bug in the filter when navigating through groups in the People module 2020-12-11 16:00:00 +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
f70e6e907f Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-11 11:34:23 +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
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
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
be497b0f3a web: common: bump version 2020-12-10 18:38:49 +03:00
b85faae56b Web: Common: fixed filter update 2020-12-10 18:41:42 +03:00
dff5391b68 Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-10 15:07:14 +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
Alexey Kostenko
abda53a082 Web: Files/People/Common: Fixed header styles 2020-12-10 13:31:53 +03:00
Alexey Kostenko
1a53841499 Web: Files/People/Common: Fixed header style 2020-12-10 09:48:35 +03:00
09ce302b57 Web: Files: Init new conversation process 2020-12-09 18:37:24 +03:00
2e0762b2c3 Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-09 16:19:03 +03:00
86325f87ba Web: Common: fixed sharing api 2020-12-09 15:37:34 +03:00
254b03032f Web: Common: Fixed status of undefined 2020-12-09 13:52:47 +03:00
Artem Tarasov
fb10d00272 Web: Files/Components/Common/People: z-index fix 2020-12-09 10:59:04 +03:00
Artem Tarasov
854acc0b1a Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-08 23:03:42 +03:00
4d88b2fc28 Update yarn.lock files 2020-12-08 18:37:19 +03:00
e4a43ff558 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 18:26:11 +03:00
Alexey Kostenko
06d6994b34 web: common: bump version 2020-12-08 18:26:38 +03:00
Alexey Kostenko
b0903aa99b Web: Common: added CustomFilter constant 2020-12-08 18:25:17 +03:00
ce4a3e3338 Update yarn.lock files 2020-12-08 18:17:46 +03:00
c8f7555017 Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2020-12-08 18:06:31 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
9f778af8bd web: common: bump version 2020-12-08 15:13:29 +03:00
42bfa9a3a6 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 15:12:42 +03:00
694daae135 Fixed redirection to default page if already logged-in 2020-12-08 15:12:33 +03:00