Commit Graph

1010 Commits

Author SHA1 Message Date
Ilya Oleshko
bdb433ae35 Web: Common : Api: Fixed default filter sort order 2020-12-14 18:41: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
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
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
b85faae56b Web: Common: fixed filter update 2020-12-10 18:41:42 +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
254b03032f Web: Common: Fixed status of undefined 2020-12-09 13:52:47 +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
b0903aa99b Web: Common: added CustomFilter constant 2020-12-08 18:25:17 +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
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
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Viktor Fomin
d9e95dabab Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:07 +03:00
TatianaLopaeva
f2a3355ae8 Web: Common: Changed import for selector getLanguage 2020-12-07 19:01:10 +03:00
Viktor Fomin
982ce4e12c
Merge branch 'develop' into feature/floating-button 2020-12-07 14:50:49 +03:00
Alexey Kostenko
149adcc372 Merge branch 'develop' into bugfix/sharing-settings 2020-12-07 13:44:42 +03:00
Viktor Fomin
b693cbdd4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 13:19:32 +03:00
Ilya Oleshko
4147d2f31a Web: Fixed temp loaders 2020-12-07 11:11:04 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
2baf8cbc76 Fixed confirm link user creation 2020-12-04 17:15:00 +03:00
0784453daf Fix errors on login and logout 2020-12-04 14:21:51 +03:00
Alexey Kostenko
ab71a6dd33 Web: Files/Common: Refactoring, changing access type to external share link 2020-12-04 14:09:31 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00
Alexey Kostenko
14031d121e Web: Files/Common: Style fix 2020-12-03 18:14:11 +03:00
a39192ff21 Web: Common: added new containers styles, added classNames to people and files containers 2020-12-03 18:03:05 +03:00
Alexey Kostenko
5fe44c3976 Web: Files/Common: Change access type to external link, refactoring, applied prettier style fix 2020-12-03 15:18:38 +03:00
Alexey Kostenko
094af7ddab Web: Common: Added access types externalLink 2020-12-02 15:30:17 +03:00
Alexey Kostenko
23b209b85c Merge branch 'develop' into bugfix/sharing-settings 2020-12-02 09:14:36 +03:00
Viktor Fomin
86425fac97 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-01 16:31:17 +03:00
Alexey Kostenko
d9b7a53f29 Web: Common: Updated api "openEdit", "setExternalAccess" 2020-11-30 18:38:20 +03:00
7c136b576e Web: Common: fixed register text align 2020-11-30 16:40:42 +03:00
Ilya Oleshko
4b20b62223 Web: Common : PageLayout : Fixed css 2020-11-30 15:59:27 +03:00
Ilya Oleshko
2ee49e80d9 Merge branch 'develop' into bugfix/login-fix 2020-11-30 15:56:30 +03:00
Viktor Fomin
2c8b384ef1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-30 15:17:48 +03:00
d0abe7666f Common: Fixed empty screen on login page on IOS 2020-11-30 15:02:57 +03:00
Ilya Oleshko
22d8111191 Web: Common : Login : Fixed display login error 2020-11-30 15:02:09 +03:00
Ilya Oleshko
f8fc428bd0 Web: Common : Login : Fixed white screen on ios 2020-11-30 13:46:52 +03:00
96b5b2658b Web: Common: fixed text alignment on login page 2020-11-30 13:20:58 +03:00
Ilya Oleshko
fcd4313402 Web: Common : Login : Fixed white screen on ios 2020-11-30 13:05:49 +03:00
Vladislav Makhov
38fac0b348 web: common: fix styles 2020-11-27 18:44:27 +03:00
Vladislav Makhov
25a4032a2a web: common: revert commit 2020-11-27 18:43:51 +03:00
Vladislav Makhov
3e58e6d7c0 web: common: add styled wrapper 2020-11-27 18:43:22 +03:00