Commit Graph

1206 Commits

Author SHA1 Message Date
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
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
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