Commit Graph

1456 Commits

Author SHA1 Message Date
4e32c53567 Web: Moved translationKeys "About" to Common.json 2021-05-24 18:36:31 +03:00
b8edf32f87 Web: Moved translationKeys "User", "Warning" to Common.json 2021-05-24 17:55:14 +03:00
Alexey Kostenko
09ff37ac0f Web: Common: Added InfiniteLoader 2021-05-24 16:24:11 +03:00
c652209b49 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-24 13:58:54 +03:00
Artem Tarasov
28dc774e26 Web: Client: Settings: fixed tKey for AccessRights' 2021-05-21 18:47:08 +03:00
Artem Tarasov
11166ed85a Web: Client: fixed usage translation keys for Settings page 2021-05-21 18:37:16 +03:00
6b7cab8236 Web: Moved translationKeys "Sending", "RecoverProcessSending", "ThirdPartyProcessSending" and "RegisterProcessSending" to "/static/locales/{lng}/Common.json" 2021-05-21 18:06:31 +03:00
4fdeec00e7 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 17:59:37 +03:00
e83d1d5922 Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json" 2021-05-21 17:59:28 +03:00
ae56fc0ecc Web: fixed translation usage for keys "Alert", "Done", "Info" 2021-05-21 17:57:55 +03:00
14214f2ad8 Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" 2021-05-21 15:00:30 +03:00
f825c6eabd Web: Resolved NotFoundKeysTest issues (OkButton, LoadingLicenseSuccess, LoadingLicenseError, OrganizationName) 2021-05-21 14:58:00 +03:00
cfbb6a3ac6 Web: Fix translation key select 2021-05-21 13:35:30 +03:00
50efa8f384 Web: Moved translationKeys "MeLabel", "DefaultOptionLabel" and "AuthorMe" to "/static/locales/{lng}/Common.json" 2021-05-21 11:16:54 +03:00
eb7f493304 Web: Moved translationKeys "RequiredField" and "FullAccess" to "/static/locales/{lng}/Common.json" 2021-05-21 11:05:37 +03:00
Alexey Kostenko
7d440ff861 Web: Client: Fixed number of administrators on access rights page 2021-05-21 10:31:00 +03:00
Artem Tarasov
b9d7afb332 Web: Client: Settings: fixed selected tree node style 2021-05-21 01:16:22 +03:00
Alexey Kostenko
e16ca1677a Web: Client: Added loading effect, if request sending more 0.1s 2021-05-20 19:12:50 +03:00
Artem Tarasov
c6fa305b30 Web: Client: NavMenu: fixed postition version-box 2021-05-20 18:38:50 +03:00
af2f24e4ac Merge branch 'develop' into feature/translations 2021-05-20 13:11:13 +03:00
Alexey Kostenko
8702a8827e Web: Client: Style fix ( Displaying long names in row and aside panel ) 2021-05-20 12:36:13 +03:00
c2a3d1efee Web: fixed mobile page swipe 2021-05-20 12:08:07 +03:00
fc822e5ad5 Web: Fix setModuleInfo usage 2021-05-20 11:27:50 +03:00
Alexey Kostenko
fc813eca1f Web: Client: Fixed help info position, removed unnecessary imports 2021-05-20 10:04:36 +03:00
c7ab1ed8a8 Web: Client: fixed styles 2021-05-20 08:17:20 +03:00
87baab93fd Web: Client: added urls on authenticator app 2021-05-20 06:38:09 +03:00
b8ef6150ab Web: Client: added error message 2021-05-20 05:22:36 +03:00
eccf52eba1 Web: Client: added button loader 2021-05-20 05:14:22 +03:00
9ebc5dada7 Web: Client: fixed styles 2021-05-20 04:51:18 +03:00
1274230c30 Web: Client: fixed styles 2021-05-20 04:49:15 +03:00
1ec0cb320b Web: Client: fixed styles 2021-05-20 04:40:21 +03:00
cebb38491e Web: Client: added loader 2021-05-20 04:27:25 +03:00
Artem Tarasov
d17887eabc Web: Client: NavMenu: fixed appearance of the cursor when hovering over profile icon 2021-05-20 01:48:06 +03:00
0f1ccb86bb Web: Client: deleted console, unused imports 2021-05-20 01:16:40 +03:00
ab1e14f503 Web: Client: fixed show/hide save button 2021-05-20 01:09:04 +03:00
Artem Tarasov
80a09fdb31 Web: Client: NavMenu: fixed position version-box when change orientation or window size 2021-05-20 00:57:11 +03:00
70de9e483c Web: Client: added loader 2021-05-19 19:30:41 +03:00
8d35cebc25 Web: Client: fixed show button 2021-05-19 18:29:49 +03:00
e5395c48d7 Web: Client: fixed save settings 2021-05-19 18:23:30 +03:00
692c60a444 Web: Client: login with code and cookie 2021-05-19 18:23:09 +03:00
ee8119eb6d Web: Client: submit by enter 2021-05-19 18:04:44 +03:00
Alexey Kostenko
c1e29096ac Web: Client: Added HelpButtons to admins page 2021-05-19 18:04:35 +03:00
1f54f301c5 Web: Client: added input error, max length 2021-05-19 18:03:50 +03:00
3f1ae6ae60 Web: Client: fixed tfa login 2021-05-19 17:25:05 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
b5578b943a Web: Client: added toastr 2021-05-19 03:27:55 +03:00
5f36009630 Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json" 2021-05-18 18:35:03 +03:00
df1ebc8d77 Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json" 2021-05-18 15:23:12 +03:00
f6ecc35ae7 Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json" 2021-05-18 15:10:20 +03:00
0ae236ad6d Web: Moved translationKey "People" to "/static/locales/{lng}/Common.json" 2021-05-18 14:42:44 +03:00
923f5012bc Web: Moved translationKey "SendButton" to "/static/locales/{lng}/Common.json" 2021-05-18 14:35:54 +03:00
49780cee24 Web: Moved translationKey "Email" to "/static/locales/{lng}/Common.json" 2021-05-18 14:27:59 +03:00
Alexey Kostenko
0f19106f6d Web: Client: Admins page - style fix 2021-05-18 14:22:48 +03:00
99b86212dd Web: Moved translationKey "Password" to "/static/locales/{lng}/Common.json" 2021-05-18 13:57:17 +03:00
35da962d06 Web: Moved translationKey "LoadingProcessing" to "/static/locales/{lng}/Common.json" 2021-05-18 13:40:32 +03:00
7a2167a0b9 Web: Rename translationKeys to Common "OKButton", "SaveButton" and "CancelButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:23:54 +03:00
Alexey Kostenko
082b06c04c Web: Client: Fixed groupButtonMenu on admins page 2021-05-18 13:14:09 +03:00
Alexey Kostenko
e043269d4f Web: Client: Disable change settings if before request not finished 2021-05-18 12:18:01 +03:00
Alexey Kostenko
745abafe28 Web: Client: Changing full access without user request, small refactoring 2021-05-18 11:30:31 +03:00
cdb9ef6be9 Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json" 2021-05-18 10:56:24 +03:00
Alexey Kostenko
969f0abb7c Web: Client: Changing access rights to modules without user request 2021-05-18 10:44:19 +03:00
04412edf82 Web: Client: deleted console.log 2021-05-17 16:52:48 +03:00
97a0dda7a6 Web: Client: added tfa login 2021-05-17 16:33:53 +03:00
Artem Tarasov
026366b1b9 Web: Client: fix position verion badge when orientation change 2021-05-17 12:53:58 +03:00
Artem Tarasov
9eb3b2a375 Web: Components/Client: fix tree loader, fix version badge 2021-05-17 12:40:46 +03:00
b91ddca880 Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json" 2021-05-17 12:08:57 +03:00
Alexey Kostenko
08cc7b3560 Web: Client: Fixed warning, style, added text translation 2021-05-17 10:56:40 +03:00
Alexey Kostenko
64f70c1bd0 Web: Client: Added translations 2021-05-14 17:22:45 +03:00
Alexey Kostenko
663417d14b Web: Client: Configuring access rights to modules, small refactoring 2021-05-14 17:05:39 +03:00
9f83d67ffb Web: Client: get secret key and qr 2021-05-14 15:59:40 +03:00
57589a4e9e Web: Client: init confirm store 2021-05-14 15:57:56 +03:00
4c618c0826 Web: Client: added confirm loader HOC 2021-05-14 15:57:00 +03:00
c4df455587 Web: Client: created confirm store 2021-05-14 15:54:03 +03:00
Alexey Kostenko
d2b51b4672 Web: Client: Removed the ability to add the portal owner to the list of administrators 2021-05-14 15:53:02 +03:00
Alexey Kostenko
22f0d3bd37 Web: Client: Do not show the owner of the portal on the admins page 2021-05-14 12:50:09 +03:00
85bd971735 Merge branch 'develop' into feature/translations 2021-05-14 12:07:48 +03:00
Alexey Kostenko
4300861abf Web: Client: Show all available modules in the settings, request for admins list only on the componentDidMount, added onFullAccessToggle method 2021-05-13 18:35:19 +03:00
Artem Tarasov
811a41bbc5 Web: Client: fixed position version badge 2021-05-13 14:04:40 +03:00
28cbbc1671 Web: Added allowForMe for Route My 2021-05-13 11:26:11 +03:00
710e3db4c5 Web: People: Added new component "people/MyProfile" for users without "People" module access 2021-05-13 10:55:31 +03:00
Alexey Kostenko
7ae752b86e Web: Client: Added ModalDialog, removed unused code 2021-05-12 16:51:50 +03:00
Alexey Kostenko
3694d3a251 Web: Client: PeopleSelector moved from header to admins page 2021-05-12 13:36:09 +03:00
Alexey Kostenko
6672b6c4f3 Web: Client: Fixed mobile view on admins page 2021-05-11 13:36:12 +03:00
Alexey Kostenko
62c789d68b Merge branch 'develop' into feature/access-rights-admins 2021-05-11 10:19:31 +03:00
7a27280dc3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-07 14:49:44 +03:00
3ffd45f998 Web: Client: fixed page title 2021-05-07 14:34:08 +03:00
c7f4e69082 Web: Client: get tfa settings 2021-05-07 14:22:32 +03:00
5216ab5b6d Web: Fixed ModalDialog component styles 2021-05-06 12:51:32 +03:00
3365d1a1dc Web: Client: added showCopyLink prop to password-input component, fixed displaying "copy email and password" link 2021-05-05 15:48:19 +03:00
d7ea692b3e Web: Client: fixed styles for createUser confirm 2021-05-05 15:29:18 +03:00
c8d73981a4 Web: Client: added tfa settings 2021-05-05 14:59:38 +03:00
9705508e61 Web: Client: Fix About page base url setup 2021-05-05 12:06:03 +03:00
abfb65f42e Web: Client: Fix height on Desktop Editors 2021-05-05 11:29:48 +03:00
32abd05d10 Web: Hide user-select on Desktop Editors 2021-05-05 11:21:21 +03:00
Alexey Kostenko
f9e04eb8d5 Web: Client: Removing admins 2021-04-30 15:57:43 +03:00
Alexey Kostenko
17d4b0a4db Merge branch 'develop' into feature/access-rights-admins 2021-04-29 15:11:50 +03:00
9e40feb771 Added and applied Common.json for common translations (languages issue) 2021-04-29 10:14:47 +03:00
Alexey Kostenko
5f81e5a0ce Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators 2021-04-29 09:40:55 +03:00
0656725149 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
2021-04-28 11:20:32 +03:00
69c9ee2d0e Web: Fixed changing the language on the page when the user changes it through the settings and has already changed the language in the profile. 2021-04-27 15:55:38 +03:00
20ee2a4772 Web: Client: fixed ConfirmRoute 2021-04-27 10:16:36 +03:00
Vladislav Makhov
9a06ab8b3b web: client: fix closing on logo click 2021-04-27 09:27:24 +03:00
Alexey Kostenko
a96ae77570 OAuth: Fixed crash on login page 2021-04-26 16:41:57 +03:00
0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Profile.json
#	products/ASC.People/Client/public/locales/ru/Profile.json
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/public/locales/en/Confirm.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Confirm.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-26 15:57:19 +03:00
Alexey Kostenko
2cc413ed16 Web: Client: Added button "AddUsers" on header on access-rights/admins page 2021-04-26 09:14:08 +03:00
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
4bdf5e4e55 Web: Fix fallback language apply on new language setup 2021-04-23 19:51:10 +03:00
Alexey Kostenko
d19a3469d1 Merge branch 'develop' into feature/access-rights-admins 2021-04-23 16:07:42 +03:00
Alexey Kostenko
67ae709db7 Web: Client: Moved page from old branch 2021-04-23 13:10:30 +03:00
Alexey Kostenko
c430e983b4 Web: Client: Added admins page 2021-04-23 08:22:58 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
Alexey Kostenko
1aae2e60cf Web: Client/Login: Removed 2nd window for actions through oAuth 2021-04-21 14:48:17 +03:00
TatianaLopaeva
0f3eb1350b Merge branch 'develop' into feature/team-template
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
TatianaLopaeva
ce20ae3de2 Web: Fixed tabIndex. 2021-04-20 11:55:14 +03:00
Ilya Oleshko
7adfe3112f Merge branch 'feature/access-rights-new' of github.com:ONLYOFFICE/AppServer into feature/access-rights-new 2021-04-19 18:54:12 +03:00
Ilya Oleshko
b8910edc01 Merge branch 'develop' into feature/access-rights-new 2021-04-19 18:53:55 +03:00
TatianaLopaeva
224bee68b4 Web: Settings: Added tabIndex. 2021-04-19 16:46:15 +03:00
Alexey Kostenko
6bb13d77c8 Web: Client: Fixed HelpButton on mobile devices 2021-04-19 16:21:02 +03:00
Alexey Kostenko
49c2496391 Web: Client: Fixed translation in PeopleSelector, small refactoring 2021-04-19 16:12:34 +03:00
Viktor Fomin
56e61a028c Web: Client: add fake qr-code 2021-04-19 14:01:29 +03:00
Viktor Fomin
e5906324c5 Web: Client: fixed key 2021-04-19 13:49:36 +03:00
461110e1a7 Web: Fix show loaders timeout for quickly responses 2021-04-19 13:36:40 +03:00
TatianaLopaeva
2a3d50cfd5 Web: Settings: Fixed position of buttons for desktop. 2021-04-19 12:30:54 +03:00
Alexey Kostenko
2749df79df Web: Client: Redirect to default page after OAuth registration 2021-04-19 10:19:27 +03:00
Viktor Fomin
15153b0fd4 Web: Client: add app activation route 2021-04-18 23:35:06 +03:00
Viktor Fomin
035708010f Web: Client: add app activation page 2021-04-18 23:34:53 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
Alexey Kostenko
49fd31c19b Web: Client: Style fix 2021-04-16 18:22:04 +03:00
TatianaLopaeva
ab10641b45 Web: Rename teamTemplate. 2021-04-16 17:10:37 +03:00
Alexey Kostenko
8cb74d14b4 Web: Client/Common: Added thirdParty signup api 2021-04-16 16:34:24 +03:00
7cb9affc77 Web: Remove tap-highlight 2021-04-16 16:27:07 +03:00
TatianaLopaeva
42d29cbae5 Web: Settings: Added customName and customId. 2021-04-16 15:57:34 +03:00
ebc751530b Web: Open menu by module title 2021-04-16 15:53:52 +03:00
TatianaLopaeva
06348316ec Web: Settings: Deleted useless code. 2021-04-16 15:43:08 +03:00
TatianaLopaeva
b0f29486ff Web: Deleted useless console log. 2021-04-16 15:36:06 +03:00
TatianaLopaeva
052157d1fe Web: Rename functions. 2021-04-16 15:35:02 +03:00
Alexey Kostenko
96ec652313 Merge branch 'develop' into feature/oauth2.0 2021-04-16 14:25:37 +03:00
TatianaLopaeva
cd00030b24 Web: Layout: Fixed close the context menu. (Only for Mobile Devices). 2021-04-16 12:45:21 +03:00
Alexey Kostenko
067079363b Web: Client: Fixed changing portal owner 2021-04-16 12:32:28 +03:00
Alexey Kostenko
d7930f9a8b Web: Client: Redesign access rights page 2021-04-16 12:19:19 +03:00
TatianaLopaeva
2075aa6647 Web: Settings: Fix displaying of loading date. 2021-04-16 11:28:06 +03:00
TatianaLopaeva
ab1d41b2a8 Web: Fixed loading date. 2021-04-16 11:21:17 +03:00
TatianaLopaeva
297e4f42e9 Merge branch 'develop' into feature/team-template 2021-04-16 09:25:43 +03:00
TatianaLopaeva
53d449c508 Web: Deleted useless console.log. 2021-04-15 19:53:49 +03:00
TatianaLopaeva
e738cab4a2 Web: Added Error message & Added loader. 2021-04-15 19:51:59 +03:00
TatianaLopaeva
69ca5bbd90 Web: Settings: Fixed:
- the input is displayed without error if you changed the template
- if the template input is empty, then the option is changed to custom
- the problem with the correct display of the current option.
2021-04-15 17:49:16 +03:00
Alexey Kostenko
cd831d3f93 Web: Client: Refactoring 2021-04-15 16:20:41 +03:00
TatianaLopaeva
a9e9729cab Web: Settings: Fixed save button if selected Custom schema. 2021-04-15 13:27:39 +03:00
TatianaLopaeva
5b07217b83 Web: Settings: Added saving session for selected option. 2021-04-15 11:28:13 +03:00
Alexey Kostenko
a8a9c8115f Web: Client: Show the real number of administrators on the portal, small refactoring 2021-04-15 10:11:15 +03:00
TatianaLopaeva
bb1c322672 Web: Settings: Added logic for click cancel button. 2021-04-14 19:31:30 +03:00
TatianaLopaeva
cfdc6f8568 Web: Added showReminder & Fixed selected option. 2021-04-14 18:44:35 +03:00
TatianaLopaeva
60218edb3b Web: Added show button only if one of the input of form was changed & Added saving data during the session. 2021-04-14 18:18:11 +03:00
Alexey Kostenko
7ee2de69d1 Web: Client: Redesign AccessRights page 2021-04-14 15:28:04 +03:00
Viktor Fomin
0150903ef3 Web: Client: add app auth route 2021-04-14 15:24:00 +03:00
Viktor Fomin
b7226cbfbc Web: Client: add app auth page 2021-04-14 15:23:28 +03:00
TatianaLopaeva
fc40487de0 Web: Added setCurrentShema and setCustomShema methods, added form validation. 2021-04-14 14:26:26 +03:00
Viktor Fomin
f76ebe4095 Web: Client: added access portal page 2021-04-14 13:01:56 +03:00
TatianaLopaeva
39064cf4e2 Web: Settings: Added cancel and save button. 2021-04-13 22:51:43 +03:00
TatianaLopaeva
a599b70c96 Web: Added name of current template. 2021-04-13 21:43:23 +03:00
TatianaLopaeva
ff370259e9 Web: Added "learn more and help url for common setting. 2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51 Web: Settings: Added logic for team template, added getCustomSchema. 2021-04-13 14:34:04 +03:00
Alexey Kostenko
571b412d27 Web: Client/Components: Fixed facebook button styles/icon, fixed translations 2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1 Web: Client/Components: Style fix and added translations 2021-04-13 09:45:52 +03:00
Alexey Kostenko
64ccdf81ae Web: Client: Added oAuth to create user form 2021-04-12 18:14:39 +03:00
TatianaLopaeva
8c7ec5d0d0 Web: Settings: Added team template to the settings tree. 2021-04-12 14:34:08 +03:00
TatianaLopaeva
91bd2c8c74 Web: Settings: Added team-template page. 2021-04-12 12:56:08 +03:00
TatianaLopaeva
23ba37cc9d Web: Layout: Fixed width of article for mobile. 2021-04-08 14:59:23 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
80e796ed1e Web: Hide displaying logo on Tables and Mobiles 2021-04-07 16:23:46 +03:00
559d7a9940 Web: Fixed export and import registerSW 2021-04-07 15:41:42 +03:00
9cbdfaab1b Web: Removed commented code 2021-04-07 15:29:00 +03:00
4484d609a6 Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update 2021-04-07 15:27:51 +03:00
TatianaLopaeva
cdef097fdd Web: Fixed hiding header when switching group. 2021-04-07 13:35:32 +03:00
Artem Tarasov
f9107ae9f6 Web: Client: fixed bug with height calculation on ios 2021-04-06 20:01:32 +03:00
Alexey Kostenko
ab157b2caf Web: Client: Fix 2021-04-05 17:34:58 +03:00
2c7434710c Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:49:08 +03:00
b9fe2c338f Added New Proxy settings 2021-04-05 15:49:02 +03:00
2655f0c62d Web: fixed Trans 2021-04-05 15:35:50 +03:00
TatianaLopaeva
24e80979f5 Web: createUser: Fixed margin-top for mobile devices. 2021-04-05 15:18:24 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room 2021-03-31 18:01:58 +03:00
Vladislav Makhov
a6f1ed972c web: fix progress-indicator style for desktop 2021-03-31 12:46:09 +03:00
Ilya Oleshko
ff79708e59 Web: Client: Layout: Fixed component render on old webkit devices, disable webkit-touch-callout at article 2021-03-31 10:42:59 +03:00
Alexey Kostenko
b8c7be90ae Web: Client: Removed ThirdPartyResponseRoute, handling third party response in static file 2021-03-30 07:50:45 +03:00
Alexey Kostenko
67ade06d34 Web: Login/Client: oauth login 2021-03-24 16:50:36 +03:00
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +03:00
30b976f25f Web: Client: removed debugger, fixed onChangeOwner 2021-03-23 15:16:18 +03:00
40567ed10b Web: Restore: remove remoteEntry script 2021-03-23 10:33:36 +03:00
fd704ab12a Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:58:06 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
4ce205fe9a Web: Client: Commented not used code 2021-03-22 20:00:38 +03:00
f19ee78c0f Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:52:33 +03:00
dea3f3bb20 Web: Fixed login redirect 2021-03-22 18:52:25 +03:00
TatianaLopaeva
26ef7bdd65 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:31:41 +03:00
e279ece3c4 Removed commented code 2021-03-22 18:24:19 +03:00
ce86b6014b Web: Settings: Add URL proxy 2021-03-22 18:24:03 +03:00
TatianaLopaeva
9baae539d2 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904 Web: Fixed displaying of shared files at aside & Deleted useless code. 2021-03-22 18:11:39 +03:00
d7981f3f53 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 17:35:41 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
Viktor Fomin
0da17ef641 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:15:07 +03:00
Viktor Fomin
74e5686a0e Web: Client: fixed language-timezone settings 2021-03-22 16:14:41 +03:00
Alexey Kostenko
3524f3b6c6 Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage) 2021-03-22 15:27:36 +03:00
83e9a8b4a4 Web: Add URL proxy on tryRedirectTo usage 2021-03-22 12:16:41 +03:00
Viktor Fomin
d3fdc2d8a3 Web: Client: fixed greeting settings 2021-03-22 11:57:08 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
accd318dc0 Web: Fixed z-index of #ipl-progress-indicator 2021-03-20 11:24:33 +03:00
6b8d644aab Web: Replaced all homepages to config variant 2021-03-19 18:22:35 +03:00
1e02f165ca Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
Artem Tarasov
dabf704485 Web: Client/Components: Wizard: layout fix 2021-03-18 22:55:15 +03:00
8e6b2c78d8 Web: Moved ipl-progress-indicator to NavMenu 2021-03-18 22:26:52 +03:00
f3f4037282 Web: Fixed Wizard 2021-03-18 21:54:03 +03:00
544abc2321 Web: Client: fixed changePassword form, removed debugger 2021-03-18 16:00:58 +03:00
TatianaLopaeva
2898cabc3f Web: NavMenu: Fixed styles of title. 2021-03-18 13:53:21 +03:00
TatianaLopaeva
80247cbb1a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 13:30:53 +03:00
TatianaLopaeva
242d6870aa Web: PaymentsEnterprise: Fix styles & Added lost import. 2021-03-18 13:30:38 +03:00
23a23a0c68 Web: Client: fixed changeEmail confirm page 2021-03-18 12:29:16 +03:00
a861371826 Web: Client: fixed activateUser confirm page 2021-03-18 12:28:49 +03:00
c3b49a713d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 18:34:09 +03:00
409073eff7 Web: Client: fixed change password 2021-03-17 18:33:05 +03:00
Alexey Kostenko
15a212a567 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 17:02:30 +03:00
Alexey Kostenko
15c1d087f7 Web: Client: Hidden AdminsSettings 2021-03-17 17:01:59 +03:00
TatianaLopaeva
a6e3349d9e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 16:46:25 +03:00
Alexey Kostenko
73727dc01f Web: Client: Fixed infinity loading in language-and-time-zone page 2021-03-17 16:41:53 +03:00
TatianaLopaeva
7beba532dd Web: Settings: Fixed displaying of icon. 2021-03-17 16:41:02 +03:00
86a63e6330 Web: Client: fixed createUser form 2021-03-17 16:35:45 +03:00
8036cb3401 Web: fixed confirm route 2021-03-17 15:56:09 +03:00
Alexey Kostenko
602ca59f2e Web: Client: Close menu after switch module 2021-03-17 15:38:21 +03:00
Artem Tarasov
1841730e20 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b Web: moved PeopleSelector to People 2021-03-17 13:37:22 +03:00
062cc4cc78 Web: Disabled initialization of service-workers on development 2021-03-17 12:59:11 +03:00
Vladislav Makhov
b0c00fe749 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/Routes.jsx
2021-03-16 16:33:18 +03:00
Vladislav Makhov
1c59410c38 web: client: remove history props drilling 2021-03-16 16:31:49 +03:00
7b5a9ab80d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 14:10:29 +03:00
24a6d61205 Web: Added creation and run of service-worker to all client apps 2021-03-16 14:10:20 +03:00
Ilya Oleshko
d99e7b731f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 17:58:45 +03:00
Ilya Oleshko
24d0af3851 Web: Client: Shell: Added route to ThirdPartyResponse page 2021-03-15 17:12:46 +03:00
Ilya Oleshko
c2902461cb Web: Client: ThirdParty: Fixed import 2021-03-15 17:12:09 +03:00
TatianaLopaeva
eac9bb9b3b Web: Settings: Fix icons displaying when moving from other modules. 2021-03-15 17:08:35 +03:00
a015b618a2 Web: Client: Added new service-worker on workbox v6 2021-03-14 23:36:20 +03:00
708a10a3f4 Web: Fixed logo displaying 2021-03-14 00:21:22 +03:00
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +03:00
8e1f5b30b5 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-03-13 16:01:41 +03:00
4d5ca86a74 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/.env
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/helpers/i18n.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/modules/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2021-03-12 19:52:01 +03:00
b1dfa97386 Web: Client: Added support of homepage 2021-03-12 17:53:02 +03:00
e514fe1a57 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
e8e78604f1 Web: Added products/apps dynamic loading 2021-03-12 13:52:30 +03:00
7465b6cda4 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:12:03 +03:00
25cbaf3c0c Web: Files: fixed NavMenu clickOutsideAction 2021-03-12 13:11:53 +03:00
TatianaLopaeva
6c4329f9c7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:10:26 +03:00
TatianaLopaeva
b68487716b Web: Added translation for setting at Nav. 2021-03-12 13:09:58 +03:00
Alexey Kostenko
91b5fc5795 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:50:25 +03:00
TatianaLopaeva
dd92aa049f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:06:32 +03:00
TatianaLopaeva
43d7f6ba68 Web: Fix translation. 2021-03-12 12:05:12 +03:00
Alexey Kostenko
16eca008cd Web: Client: Added bodyLoader to accessRights page 2021-03-12 11:54:53 +03:00
Artem Tarasov
7846f41a06 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 10:12:12 +03:00
Viktor Fomin
ca4727978c Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 00:14:08 +03:00
Viktor Fomin
59aa9ccd8f Web: Client: hide header in editor 2021-03-12 00:14:00 +03:00
Artem Tarasov
63f1e788ad Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 21:14:21 +03:00
Artem Tarasov
96271b4dfb Web: Components/Client: changed the way of passing elements to TabContainer component 2021-03-11 13:43:54 +03:00
TatianaLopaeva
749e028beb Web: Layout: Fixed displaying of article. 2021-03-11 13:12:35 +03:00
TatianaLopaeva
1afbcc0009 Web: Settings: Added top loading indicator. 2021-03-11 10:19:56 +03:00
Alexey Kostenko
26a4d5e4cf Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 13:41:02 +03:00
Alexey Kostenko
960342236d Web: Client: Fixed transition from documents to settings 2021-03-10 13:40:39 +03:00
Viktor Fomin
585dbf3680 Web: fixed loader 2021-03-10 11:27:20 +03:00
Viktor Fomin
9d06a6618a Web: Client: change loader 2021-03-09 19:36:15 +03:00
TatianaLopaeva
289f749288 Web: About: Fix translation. 2021-03-05 14:24:34 +03:00
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +03:00
TatianaLopaeva
5412f7b860 Web: NavMenu: Fixed icon path, deleted useless icons from modules. 2021-03-05 11:09:23 +03:00
82a6dafb0f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 19:09:58 +03:00
28a798c542 Web: Fixed work with translations + refactoring:
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
Alexey Kostenko
b0f3a4e426 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 17:32:09 +03:00
TatianaLopaeva
b64736c363 Web: Added translation to PeopleSelector. 2021-03-04 14:57:48 +03:00
TatianaLopaeva
5c826bcf29 Web: Added top loading indicator for desktop. 2021-03-04 14:36:31 +03:00
Alexey Kostenko
9e80a2010c Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module) 2021-03-04 13:13:26 +03:00
Alexey Kostenko
b3a3851d68 Web: Client: Fixed the transition from the people module to the documents module 2021-03-03 19:17:00 +03:00
68930abdcb Web: Move toastr function to Web Client (mf: "studio/toastr") 2021-03-03 16:46:04 +03:00
fe39c60633 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 16:19:09 +03:00
TatianaLopaeva
ada47512f1 Web: Moved PeopleSelector to the Web Client. 2021-03-03 15:41:28 +03:00
efaeaff894 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 14:46:45 +03:00
684c0e777f Web: Refactoring 2021-03-03 14:46:37 +03:00
TatianaLopaeva
7b0faa4747 Web: Moved Main into the Web Client. 2021-03-03 13:02:56 +03:00
TatianaLopaeva
d6cf286cd0 Web: Moved Layout to the Web Client. 2021-03-03 12:47:28 +03:00
TatianaLopaeva
988afe48fd Web: Moved profile menu to the NavMenu. 2021-03-03 11:25:28 +03:00
TatianaLopaeva
5212633a8d Web: Moved errors from Common to the Web Client. 2021-03-03 11:15:11 +03:00
d6f593e4d4 Web: Fixed loading NavMenu translations on different pages 2021-03-02 20:21:37 +03:00
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00
b9ad73b9ce Web: Added useful imports 2021-03-01 22:59:47 +03:00
Viktor Fomin
6dd4847ea9 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:16:17 +03:00
Viktor Fomin
149e44b088 Web: Client: fixed loader width 2021-03-01 15:16:09 +03:00
Vladislav Makhov
628916a1c1 web: people: fix svg import 2021-03-01 11:56:11 +03:00
TatianaLopaeva
c52680d4c8 Web: Settings: Fix displaying of icons. 2021-02-28 21:25:14 +03:00
Viktor Fomin
604ff5d925 Web: Client: added loading shell 2021-02-26 16:49:55 +03:00
TatianaLopaeva
ca0c86f2d4 Web/Common: Fix active title of menu, fix transition without redirect. 2021-02-26 13:50:20 +03:00
96c4d63abe Web: Fixed Files opening + added devtool: "inline-source-map" 2021-02-26 12:02:54 +03:00
Artem Tarasov
7af174ca65 Web: Client: fix imports 2021-02-26 00:17:25 +03:00
Artem Tarasov
48b3c6b445 Web: Common: fix after merge, fix imports and hierarchy 2021-02-25 17:20:11 +03:00
Artem Tarasov
69ed46e8ae Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	web/ASC.Web.Login/src/Login.jsx
2021-02-25 15:27:36 +03:00
Artem Tarasov
989fba5ecc Web: applied new import from appserver/common 2021-02-25 15:22:53 +03:00
55a4a53bbc Web: Fixed 404 error on translation.json loading 2021-02-25 12:25:16 +03:00
36f6feec83 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-24 20:26:01 +03:00
471dcb1de7 Removed useless import 2021-02-24 20:25:54 +03:00
72675eb198 Web: Client: Simplified imports 2021-02-24 20:24:38 +03:00
Artem Tarasov
69dd27fac7 Web: applied new import from appserver/components 2021-02-24 20:11:23 +03:00
507fadff55 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	packages/asc-web-components/src/components/icons/svg/index.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	yarn.lock
2021-02-24 10:57:03 +03:00
34d9eed580 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
#	packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
#	packages/asc-web-common/src/store/AuthStore.js
#	packages/asc-web-common/src/store/ModuleStore.js
#	packages/asc-web-common/src/store/SettingsStore.js
#	packages/asc-web-common/src/store/UserStore.js
#	packages/asc-web-common/src/store/auth/actions.js
#	packages/asc-web-common/src/store/auth/index.js
#	packages/asc-web-common/src/store/auth/reducer.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	products/ASC.Files/Client/config-overrides.js
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/Article/Header/index.js
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
#	products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
#	products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
#	products/ASC.Files/Client/src/helpers/desktop.js
#	products/ASC.Files/Client/src/helpers/i18n.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	products/ASC.Files/Client/src/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/rootReducer.js
#	products/ASC.People/Client/config-overrides.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/Article/Header/index.js
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
#	products/ASC.People/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Reassign/index.js
#	products/ASC.People/Client/src/helpers/i18n.js
#	products/ASC.People/Client/src/helpers/utils.js
#	products/ASC.People/Client/src/index.js
#	products/ASC.People/Client/src/store/people/reducers.js
#	products/ASC.People/Client/src/store/portal/actions.js
#	products/ASC.People/Client/src/store/portal/reducers.js
#	products/ASC.People/Client/src/store/profile/actions.js
#	products/ASC.People/Client/src/store/profile/selectors.js
#	products/ASC.People/Client/src/store/rootReducer.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/config-overrides.js
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/About/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
#	web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/src/helpers/confirmRoute.js
#	web/ASC.Web.Client/src/helpers/i18n.js
#	web/ASC.Web.Client/src/helpers/utils.js
#	web/ASC.Web.Client/src/index.js
#	web/ASC.Web.Client/src/store/confirm/actions.js
#	web/ASC.Web.Client/src/store/payments/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Client/src/store/settings/selectors.js
#	web/ASC.Web.Client/src/store/store.js
#	web/ASC.Web.Client/src/store/wizard/actions.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	web/ASC.Web.Login/src/Login.jsx
#	web/ASC.Web.Login/src/sub-components/register-container.js
#	yarn.lock
2021-02-24 10:30:42 +03:00
TatianaLopaeva
3e3b079b5a Web: Components: Deleted useless Icons component. 2021-02-23 22:14:42 +03:00
d270048827 Web: Removed commented code 2021-02-23 12:46:33 +03:00
ef067c6040 Web: Client: Moved translations to public folder 2021-02-23 12:10:31 +03:00
c32a2b64dc Web: Client: Fixed open third-party dialog 2021-02-23 12:01:29 +03:00
09a600b042 Web: Client: Added config 2021-02-23 11:59:24 +03:00
TatianaLopaeva
f3efd89bfc Web: Added Setting Routing. 2021-02-20 18:41:26 +03:00
TatianaLopaeva
5fdb5c8508 Web: Fix not displaing of icons. 2021-02-20 18:25:46 +03:00
TatianaLopaeva
1f8fd0a9db Web: Added styles for icons. Added common icons styles. 2021-02-20 17:54:12 +03:00
6c80ebdff0 Merge branch 'develop' into feature/mobx
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.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.Files/Client/src/store/files/selectors.js
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/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/Home/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	products/ASC.People/Client/src/store/group/actions.js
#	products/ASC.People/Client/src/store/people/actions.js
#	products/ASC.People/Client/src/store/people/selectors.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/About/index.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
#	web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
TatianaLopaeva
b625eb3647 Web: Home: Revert file changes. 2021-02-20 11:53:29 +03:00
TatianaLopaeva
7023cf5f3a Web: Transferring icons from a shared folder to modules. Icons are displayed by url. 2021-02-20 11:46:32 +03:00
TatianaLopaeva
30d4c580ac Web: Added ThemeProvider to the App. 2021-02-20 10:59:40 +03:00
87b1108147 Web: Turned debug in i18n 2021-02-19 21:59:33 +03:00
19c7104d3d Web: Removed useless dev packages + fixed warnings of building 2021-02-19 20:51:44 +03:00
85a500eac6 Web: Client: Simplified translation 2021-02-19 20:26:41 +03:00
Ilya Oleshko
1c01c3ce3a Web: Client: Fixed style for learn more links 2021-02-19 13:26:09 +03:00
Ilya Oleshko
d8d850b089 Web: Client: Open app link allowed only for IOS devices, added learn more links 2021-02-19 13:21:33 +03:00
Ilya Oleshko
ebc6d5942e Web: Client: Changed main container for ComingSoonPage at desktop version 2021-02-19 10:53:04 +03:00
Ilya Oleshko
cb72f2241b Web: Added product version badge 2021-02-18 15:55:26 +03:00
f36d05ccf4 Web: Fixed work process 2021-02-18 15:52:13 +03:00
Ilya Oleshko
d818d2272c Web: Client: Added new coming soon module page, fixed route, added translations 2021-02-16 16:11:49 +03:00
0b9a258f91 Web: Client: Moved to MobX 2021-02-15 22:43:07 +03:00
fb6b345734 Web: Client: Fixed setDocumentTitle 2021-02-05 14:22:26 +03:00
670ba9c4be Web: Rewritten asc-web-common to mobx 2021-02-03 15:42:47 +03:00
560133f82c Web: replaced components wrapper to mobx inject 2021-02-02 19:17:33 +03:00
2a79d8bb8d Web: Moved code to AuthStore usage 2021-02-02 17:26:58 +03:00
70c22c9d33 Web: Changes to AuthStore 2021-02-02 12:55:14 +03:00
f8e6a72460 Web: Changed work with settings data from redux to mobx 2021-02-02 09:48:57 +03:00
TatianaLopaeva
af96aaf2b3 Web: Changed imports. 2021-02-01 16:10:02 +03:00
Vladislav Makhov
0c72a6a140 web: add mobx provider 2021-02-01 14:01:09 +03:00
Vladislav Makhov
de88da2fa7 Web: Changed work with user data from redux to mobx 2021-02-01 11:45:26 +03:00
f91ce2390b Web: Changed work with modules from redux to mobx 2021-01-29 18:06:02 +03:00
TatianaLopaeva
ddab131a90 Web: Deleted useless import. 2021-01-29 17:41:35 +03:00
TatianaLopaeva
cf65b86b22 Web: Added Payments Routing. 2021-01-29 17:39:26 +03:00
652c7bd906 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/MobileLayout.js
#	packages/asc-web-common/src/components/Layout/ScrollToTop.js
#	packages/asc-web-common/src/components/Layout/context.js
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/NavMenu/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
#	packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
#	packages/asc-web-components/src/components/icons/svg/load.error.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-29 16:39:00 +03:00
8a9bd141a5 Web: Added Error404 routing 2021-01-29 13:22:41 +03:00
Ilya Oleshko
8226d9185c Merge branch 'develop' into feature/not-implemented-page 2021-01-29 12:38:22 +03:00
436bf7a06e Web: People: Added routes 2021-01-27 10:31:29 +03:00
TatianaLopaeva
943015a8d6 Web: Fixed after merge. 2021-01-26 18:59:19 +03:00
3efedf74eb Web: Fixed routing on Module link 2021-01-26 16:28:51 +03:00
TatianaLopaeva
2b8dfc80e9 Web: Common/Files/People: Fixed "jumps" when go to the next page. 2021-01-26 13:50:29 +03:00