Commit Graph

715 Commits

Author SHA1 Message Date
TatianaLopaeva
7e034e60de Web: Common: Added display condition for section-header when group button menu is visible 2020-11-05 10:39:53 +03:00
Viktor Fomin
1c2e8e5c67 Web: Common: create headline loader 2020-11-04 12:27:56 +03:00
Viktor Fomin
37fc3fff7c Web: Common: added x, y props 2020-11-04 12:24:52 +03:00
Viktor Fomin
46a9fe2e45 Web: Common: Create head loader 2020-11-04 12:21:13 +03:00
Viktor Fomin
0efd774bba Web: Common: Create rows loader 2020-11-04 01:54:44 +03:00
Viktor Fomin
a591a48e13 Web: Common: create tree folder loader 2020-11-03 23:00:43 +03:00
Viktor Fomin
234b323633 Web: Common: fix coordinate x 2020-11-03 22:59:36 +03:00
Viktor Fomin
c58a22748c Web: Common: Create circle loader 2020-11-03 20:22:32 +03:00
Viktor Fomin
f02e32894b Web: Common: added rectangle loader 2020-11-03 18:37:08 +03:00
Viktor Fomin
e99cdff1ad Web: Common: fix column size 2020-11-03 18:35:44 +03:00
Viktor Fomin
e9d3fe1775 Web: Common: added props for rectangle loader 2020-11-03 18:34:39 +03:00
TatianaLopaeva
c36f79b526 web: Common: Added window width in comparison condition 2020-11-03 16:02:20 +03:00
Viktor Fomin
8ec67a1c03 Web: Common: Create FilterLoader stories 2020-11-03 15:56:33 +03:00
Viktor Fomin
f1d5b08521 Web: Common: Fix filter loader 2020-11-03 15:55:51 +03:00
Viktor Fomin
1e4558a646 Web: Common: Create rectangle loader 2020-11-03 15:55:14 +03:00
Artem Tarasov
8507650485 Web: Common: PageLayout: fixed selection items 2020-11-03 12:23:46 +03:00
TatianaLopaeva
e876d2939a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-11-02 16:41:52 +03:00
Artem Tarasov
5f6e0e60e8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2020-11-02 13:36:03 +03:00
TatianaLopaeva
5c89eabc81 Web: Common/Components: Added Hide Header on Scroll Down & Show on Scroll Up 2020-11-02 11:55:59 +03:00
440395d341 Web: Common: fixed update main height timeout 2020-10-30 17:22:49 +03:00
Ilya Oleshko
797afe5c72 Web: Common: changed ReactResizeDetector refreshRate 2020-10-30 14:24:24 +03:00
ea21d49ddc Web: Common: fixed main container height 2020-10-30 12:08:34 +03:00
13c690e183 Web: Common: fixed main container height 2020-10-29 18:18:00 +03:00
bc725f29df Web: Common: added re-resizable package, added new acticle 2020-10-29 17:33:05 +03:00
TatianaLopaeva
aca906db56 Web:Common: Refactoring 2020-10-29 13:23:21 +03:00
Alexey Kostenko
55830ab25c Web: Common/Files: PeopleSelector: Added counter to footer button 2020-10-29 10:55:06 +03:00
Alexey Kostenko
19f1984e73 Web: Common/Files: GroupSelector: Added counter to footer button 2020-10-29 10:54:10 +03:00
Alexey Kostenko
638eacd052 Web: Common: AdvancesSelector: Added showCounter prop to AdvancesSelector 2020-10-29 10:44:17 +03:00
TatianaLopaeva
d7a8226671 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
2020-10-28 19:02:51 +03:00
TatianaLopaeva
2c991fcfd7 Web:Common Deleted unnecessary import 2020-10-28 16:36:16 +03:00
TatianaLopaeva
c553d8990b Web: Common: Added context for passing ref to section-body 2020-10-28 16:34:56 +03:00
Artem Tarasov
e9144b7f67 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-10-28 14:07:50 +03:00
c53446f5bc Web: Common: fixed main container height 2020-10-28 13:35:06 +03:00
Artem Tarasov
e4599f8279 Web: Files: VersionHistory: added props borderBottom for header(tablet) 2020-10-27 15:15:57 +03:00
TatianaLopaeva
ee82a0d064 Web: Common: Added styles and function scrolledTheVerticalAxis 2020-10-27 11:16:59 +03:00
TatianaLopaeva
9c95aa4362 Web: Common: Refactoring 2020-10-27 11:13:42 +03:00
Artem Tarasov
5c07f4a631 Web: Common: PageLayout: fixed padding between filter and row 2020-10-26 14:24:09 +03:00
Artem Tarasov
faf0adf664 Web: Common: PageLayout: fixed layout section-header 2020-10-26 13:53:42 +03:00
Artem Tarasov
61443b6e0a Web: Common: PageLayout: fixed position SectionToggler 2020-10-26 13:02:52 +03:00
Artem Tarasov
5f59dc385b Web: Common: PageLayout: fix article layout 2020-10-26 12:32:51 +03:00
Artem Tarasov
ebc9ae958b Web: Common: PageLayout: fixed article-pin-panel size 2020-10-26 11:59:46 +03:00
TatianaLopaeva
ae5520a56b Web: Common: Fixed display menu and header 2020-10-26 11:55:34 +03:00
TatianaLopaeva
d5bc77b554 Web: Common: Increasing header length 2020-10-26 10:41:36 +03:00
TatianaLopaeva
6f45c53522 Web:Common: Made the header of NavMenu and header of section fixed on top for tablet and mobile 2020-10-26 10:31:04 +03:00
TatianaLopaeva
ccc8a60f87 Web: Common: Disabled body scrolling for mobile (for full scroll page) 2020-10-23 12:35:38 +03:00
TatianaLopaeva
b74a6a11a0 Web: Common: Changed Layout with full page scroll for mobile 2020-10-23 12:31:58 +03:00
TatianaLopaeva
ce6f879f67 Web: People/Common added Layout 2020-10-22 20:09:44 +03:00
TatianaLopaeva
e307e0c1c0 Web: Common: Added min-height for mobile 2020-10-22 16:10:31 +03:00
Alexey Kostenko
bb00498c44 Web: Common/Components/Files: Fixed filter and file create field styles 2020-10-22 14:10:58 +03:00
TatianaLopaeva
cf62d42532 Web:Added styled 2020-10-22 13:15:02 +03:00
TatianaLopaeva
9bb4abfd5f Web: Common: Changed styles of article for tablet and mobile 2020-10-22 10:55:30 +03:00
TatianaLopaeva
8a62445203 Web: People/Common Added full page scroll 2020-10-22 10:52:42 +03:00
Alexey Kostenko
5f4921d341 Web: Files/Components/Common: Fixed row styles 2020-10-21 16:54:22 +03:00
Alexey Kostenko
d8fa9b1b60 Web: Common/Components: Style fix in filter and rowContainer 2020-10-21 15:05:08 +03:00
f2fcf077a2 Web: Common: Fixed start PageLayout story and README 2020-10-16 15:56:35 +03:00
0181514267 Web: Common: Fixed self link 2020-10-16 15:55:47 +03:00
1a484f1805 Web: Common: Applied prettier style fix 2020-10-16 15:38:04 +03:00
TatianaLopaeva
d4d7c9db0d Web: Common: fixed changing language of title toastr 2020-10-15 10:55:47 +03:00
Artem Tarasov
a4a959f972 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 13:43:16 +03:00
1d4b3785bb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-13 13:31:24 +03:00
0712677297 Web: Common: fixed MediaViewer close, fixed share dropdown styles 2020-10-13 13:30:26 +03:00
TatianaLopaeva
6a0e34a7a2 Web: Common: Added language into array of useEffect 2020-10-13 10:52:44 +03:00
Artem Tarasov
8453611714 Web: Common: added SettingsFiles loader 2020-10-12 14:52:49 +03:00
Artem Tarasov
421d71c4fe Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Common/src/components/Loaders/index.js
2020-10-09 15:58:50 +03:00
Artem Tarasov
5a5fb5b036 Web: Common: added ProfileViewLoader 2020-10-09 15:57:04 +03:00
226d4c6cc5 Web: Files: Add and applied Filter loader 2020-10-09 14:23:40 +03:00
e3fde6fd77 Web: Common: fixed main height 2020-10-08 12:42:59 +03:00
cbde3120aa Web: Common: Removed Layout and StudioLayout components 2020-10-07 12:48:38 +03:00
f9bf1dc7d7 Web: Common: Removed useless code 2020-10-06 18:18:36 +03:00
fcc1ca32dd Web: Fixed showing Error404 before user not loaded 2020-10-06 11:53:56 +03:00
8f086d1183 Web: Fixed NavMenu crash on currentProduct equals null 2020-10-06 10:10:42 +03:00
a6bc650da6 Web: Common: NavMenu refactoring 2020-10-05 18:25:01 +03:00
7bbba5f158 Web: People: Re-written Home/Body with selectors and reselect + refactoring 2020-10-01 22:01:52 +03:00
c008acee57 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
2020-10-01 17:32:12 +03:00
3b2648b18c Web: Common: fixed main wrapper height 2020-10-01 13:16:31 +03:00
TatianaLopaeva
2261880855 Added language into array of useEffect(StudioLayout) and refactoring changeLanguage function 2020-10-01 09:08:25 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
981e7646ca Web: Files: Fixed opening DocEditor 2020-09-29 14:21:37 +03:00
ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
5ad8730c46 Web: People: Fixed open @self profile 2020-09-28 16:20:16 +03:00
056fefcd40 Web: Common: Added ProfileMenu actions to NavMenu 2020-09-28 11:26:21 +03:00
TatianaLopaeva
48854fcb5e Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 10:14:35 +03:00
a6180afa35 Web: Normalize routing + refactoring 2020-09-25 19:14:50 +03:00
Alexey Kostenko
d1c926e3cd Web: Common: Added component Toast to common library (for translate titles) 2020-09-25 16:13:28 +03:00
TatianaLopaeva
eac4556983 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-25 10:44:31 +03:00
72cf8e4f2b Web: Moved RowsLoader to ASC.Web.Common 2020-09-25 10:36:13 +03:00
7b6d320ebe Web: Common: fixed icons 2020-09-24 16:54:31 +03:00
a4357170a3 Web: Common: fixed image-viewer icons 2020-09-24 15:31:53 +03:00
c6b7a5ac29 Web: Files: added hiding aside panel on actions from the main button 2020-09-24 15:06:37 +03:00
b04f22b6e5 Web: Moved TreeFolderLoader to ASC.Web.Common 2020-09-24 13:58:18 +03:00
f2b0cdf1af Web: Moved HeadlineLoader to ASC.Web.Common 2020-09-24 13:37:54 +03:00
TatianaLopaeva
32b76b88f6 Hiding the payments module 2020-09-23 17:59:01 +03:00
TatianaLopaeva
1849e3712d Merge branch 'feature/files' into feature/payments-enterprise 2020-09-23 15:25:23 +03:00
a2be460357 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-09-22 19:11:45 +03:00
Alexey Kostenko
16ed13b745 Web: Common: Fix mobile ArticleBody styles 2020-09-22 15:49:09 +03:00
Artem Tarasov
8748a0fc52 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-22 15:43:15 +03:00
6101dc32db Web: Common: fixed main styles 2020-09-22 15:33:12 +03:00
Artem Tarasov
9632515ea1 Web: Common: fixed color of label in sort-combobox 2020-09-22 15:10:55 +03:00
c65fa43050 Web: Common: fixed main style 2020-09-22 14:14:30 +03:00
6936c060e5 Web: Common: fixed MediaViewer styles 2020-09-22 10:15:37 +03:00
1b2776aecc Web: Common: Added defaultPage 2020-09-21 19:31:24 +03:00
04b223d681 Web: Common: Show content after userLoaded 2020-09-21 19:27:39 +03:00
86bcde60b1 Web: Common: Extracted Main and NavMenu as separated components from Layout 2020-09-21 18:27:22 +03:00
TatianaLopaeva
ca420104fc Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
Artem Tarasov
405eabd720 Web: Components: fixed passing props selectedOprions in PeopleSelector 2020-09-19 23:24:18 +03:00
0f00799480 Web: Client: Fixed redirect to defaultPage 2020-09-19 18:24:48 +03:00
dbad9de295 Web: Common: fixed progress styles 2020-09-18 17:06:58 +03:00
809d167e29 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-18 15:54:55 +03:00
17ffb8999d Web: Common: fixed progress styles 2020-09-18 15:45:21 +03:00
TatianaLopaeva
fa89566f8f Added headline 2020-09-18 12:24:14 +03:00
Alexey Kostenko
3b1805f1f9 Web: Common: Unpin sidebar if not enough screen width 2020-09-17 15:52:07 +03:00
Alexey Kostenko
dfd94a854f Web: Components/Common: Added new width constant for pin/unpin, style fix 2020-09-17 13:22:47 +03:00
TatianaLopaeva
a858a3a846 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-17 11:25:51 +03:00
Alexey Kostenko
d60bdedf9b Web: Common: Fix pin/unpin on IOS devices 2020-09-17 09:17:47 +03:00
e5525f4e08 Web: Components: Removed useless comma 2020-09-16 09:50:31 +03:00
TatianaLopaeva
3eeb24a5b5 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-15 17:52:45 +03:00
3c0d0c0523 Web: Common: fixed filter styles 2020-09-15 15:10:12 +03:00
584bee8198 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-15 14:47:03 +03:00
01d6e7d3ad Web: Commpon: fixed the display of the filter selector element 2020-09-15 14:46:53 +03:00
Vladislav Makhov
7cc130bdc9 Web: Common: sorting dropdown is now hiding, when option clicked 2020-09-14 14:02:11 +03:00
e8f1d01aae Web: Common: PeopleSelector: hidden user tooltip (issue: too slow work) 2020-09-09 22:03:12 +03:00
99db325520 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-09 21:49:34 +03:00
b3b6fd0938 Web: Components: Re-written ModalDialog component with SLOT pattern 2020-09-09 21:49:25 +03:00
Artem Tarasov
25834a705c fixed warning selectedOption of type string 2020-09-09 18:06:09 +03:00
Alexey
7ba59aae1e Web: Common: Temporarily hiding the settings module from left menu 2020-09-09 14:45:53 +03:00
72ebd235ec Merge branch 'feature/files' into feature/payments-enterprise 2020-09-07 18:42:57 +03:00
Artem Tarasov
797dd6c249 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:27:39 +03:00
Artem Tarasov
6d68dfd0c6 added redirect from / to homepage(settings in state.auth.settings.homepage) 2020-09-07 18:26:44 +03:00
d9783ecf26 Web: Common: fixed sort-combobox styles, added isMobile prop 2020-09-07 17:31:36 +03:00
52104fafd6 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/api/client.js
2020-09-04 21:36:25 +03:00
4fd7cffa63 Web: Common: fixed sort button 2020-09-04 15:56:49 +03:00
Ilya Oleshko
4794084ef1 Web: Common: FilterInput : Fix default height for items 2020-09-04 13:56:37 +03:00
4686122183 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-04 10:15:48 +03:00
da50146545 Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render) 2020-09-02 12:19:21 +03:00
Ilya Oleshko
8edef50722 Web: Common: PageLayout : Fix ReactResizeDetector options for fast resize 2020-09-01 16:07:07 +03:00
Ilya Oleshko
f1902e1ec6 Web: Common: PageLayout : Added size calculating on first mount for ReactResizeDetector 2020-09-01 15:22:49 +03:00
TatianaLopaeva
6ee4cbc5b4 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-01 11:05:58 +03:00
d16652f051 Web: Common: fixed login page for new PageLayout body 2020-08-31 17:35:39 +03:00
44aaf5267e Web: Common: fixed section styles 2020-08-31 13:31:39 +03:00
a4a9234328 Web: Common: added react-resize-detector package, fixed styles 2020-08-31 10:03:19 +03:00
TatianaLopaeva
2022bd4ac1 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
4fb43397d7 Added translation for payments in StudioLayoute 2020-08-28 10:48:45 +03:00
TatianaLopaeva
8bea385182 Added a link and icon for payments in StudioLayout 2020-08-28 10:46:37 +03:00
82af63f80d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-26 11:35:19 +03:00
28dc9efd16 Web: Common: moved DragAndDrop component 2020-08-26 11:30:46 +03:00
667b3f0032 web: common: Fixed Cannot update a component from inside the function body of a different component (issue: call of i18n.changeLanguage without useEffect) 2020-08-25 16:28:14 +03:00
366821d868 Web: Common: fixed filter 2020-08-25 14:03:49 +03:00
Ilya Oleshko
a003d65f66 Web: People: FilterBlock : Fixed showItem condition for simple selector 2020-08-25 13:07:22 +03:00
42927df84d Web: Common: fixed selector selected group 2020-08-21 17:38:11 +03:00
76d48fabdd Web: Common: fixed the display and closing of the filter 2020-08-21 16:18:17 +03:00
d58cdc3cc5 Web: Common: fixed selector styles 2020-08-20 17:39:57 +03:00
14abe9c3f4 Web: Common: fixed profile menu 2020-08-20 12:45:59 +03:00
d7b5444385 Web: Common: fixed selector styles 2020-08-19 14:58:23 +03:00
9b491cf1d8 Web: Common: added aside panel to context-menu-button 2020-08-19 10:37:52 +03:00
32f335ba50 Web: Common: added new styles 2020-08-18 17:02:20 +03:00
ef34adb788 Web: Common: fixed Selector 2020-08-18 10:47:33 +03:00
9fb1a37af3 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-17 16:49:05 +03:00
eb9592abd5 Web: Common: fixed selector styles, fixed filter styles 2020-08-17 16:45:14 +03:00
c16c9b280a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-17 14:19:19 +03:00
105ac1a577 Web Common: simplified configuration of i18n 2020-08-14 22:32:21 +03:00
129160c35e Web: Common: fixed filter styles 2020-08-14 17:06:08 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
Alexey
73d1cf269b Web: Common: Added keyboard events to MediaViewer 2020-08-12 16:11:30 +03:00
408de4246f Web: Common: fixed files selection 2020-08-11 17:49:20 +03:00
5f32a94db0 Web: Common: fixed file selection 2020-08-11 17:36:22 +03:00
Ilya Oleshko
fdbdf6a8b6 Web: Common: PageLayout: Fixed selection on draging 2020-08-11 15:53:39 +03:00
Ilya Oleshko
3de0e34389 Web: Common: PageLayout: Fixed StudioLayout container 2020-08-11 15:39:17 +03:00
Ilya Oleshko
47889d384f Web: Common: PageLayout: Fixed PrivateRoute container 2020-08-11 15:37:34 +03:00
Ilya Oleshko
89bfd913e6 Web: Common: PageLayout: Fixed ExternalRedirect container 2020-08-11 15:36:36 +03:00
Ilya Oleshko
66adcdcefe Web: Common: PageLayout: Fixed PageLayout sub components to class components 2020-08-11 15:35:24 +03:00
Ilya Oleshko
d02afe646a Web: Common: PageLayout: Fixed PageLayout for children logic 2020-08-11 15:34:00 +03:00
Ilya Oleshko
fdb4f43028 Web: Common: PageLayout: Removed function (new) layout 2020-08-11 15:31:45 +03:00
Ilya Oleshko
4684c6ec84 Web: Common: PageLayout: Added SectionBodyContent container 2020-08-11 15:30:14 +03:00
Ilya Oleshko
a2dface5ac Web: Common: Filter: Moved function initialization out of render 2020-08-11 11:11:48 +03:00
Artem Tarasov
c4ba6adee2 fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout 2020-08-06 00:01:41 +03:00
Artem Tarasov
bdeedbbb42 added seLicense() 2020-08-03 22:36:13 +03:00
Artem Tarasov
90cda6ef62 fixed redirect to /login 2020-08-03 10:57:58 +03:00
72ae1f5e9b Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-31 16:49:54 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
5cd4a1aaa8 Web: Common: fixed SelectedFrame select target 2020-07-30 11:55:36 +03:00
Vladislav Makhov
13a4bae881 Fix toastr 2020-07-29 17:13:40 +03:00
Artem Tarasov
e949ff75ba added Layout 2020-07-29 13:05:23 +03:00
Artem Tarasov
4c9a7dadfd Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-29 11:52:18 +03:00
0231e60cc7 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
#	web/ASC.Web.Components/src/index.js
2020-07-28 17:34:46 +03:00
Vladislav Makhov
c54129bf33 Recover: fix translation 2020-07-28 13:25:09 +03:00
Vladislav Makhov
1f1a6891b2 Style fixes 2020-07-28 10:29:55 +03:00
Vladislav Makhov
ddf497bac4 Merge differences from master after header fix 2020-07-28 10:24:53 +03:00
Vladislav Makhov
39150efb4f Merge branch 'master' into feature/new-login-page
# Conflicts:
#	web/ASC.Web.Common/src/components/Layout/i18n.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/Layout/locales/en/translation.json
#	web/ASC.Web.Common/src/components/Layout/locales/ru/translation.json
2020-07-27 17:28:28 +03:00
Vladislav Makhov
cfdf71157f Fix 2020-07-27 16:41:15 +03:00
Vladislav Makhov
86170f2923 Fix styles 2020-07-27 16:36:02 +03:00
Vladislav Makhov
3fdfb6211d Fix translation 2020-07-27 15:51:04 +03:00
Vladislav Makhov
1b6d1b24c1 Add api post data 2020-07-27 14:37:21 +03:00
Vladislav Makhov
64e0a940e1 PropTypes 2020-07-24 16:20:35 +03:00
Vladislav Makhov
c07f4cf713 Set mock 2020-07-24 16:04:54 +03:00
Vladislav Makhov
7a3ff1c401 Fix validate 2020-07-24 15:50:54 +03:00
Vladislav Makhov
5315eb3bfc Fix styles 2020-07-24 15:47:08 +03:00
Vladislav Makhov
362f1cca02 Fix render 2020-07-24 15:35:24 +03:00
Vladislav Makhov
b3abfa05cc Add recover access 2020-07-24 15:31:23 +03:00
Vladislav Makhov
68f3139c46 Add translations 2020-07-24 15:12:31 +03:00
Vladislav Makhov
749702248d Refactor 2020-07-24 14:49:01 +03:00