Commit Graph

1651 Commits

Author SHA1 Message Date
9b50f1fdb4 WEb: Settings: Backup: Fixed translation fro manual backup. 2021-05-25 18:08:52 +03:00
4228b0a5dc Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-25 17:26:12 +03:00
2452ec957d Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json" 2021-05-25 17:16:09 +03:00
f23775b466 Web: Settings: Backup: Make universal SelectedFolder, refactoring and Disabled third-party resource if it is not available. 2021-05-25 14:08:46 +03:00
Artem Tarasov
671f98519a Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json" 2021-05-25 12:49:56 +03:00
60679a5da7 Web: Moved translationKeys "Disabled", "Close" 2021-05-25 11:43:42 +03:00
cd83106bb9 Web: Settings: Backup: Rename folder. 2021-05-24 20:32:09 +03:00
e01af3fd20 Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json" 2021-05-24 19:47:26 +03:00
a80890f7cc Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json" 2021-05-24 19:40:26 +03:00
f94c19385f Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json" 2021-05-24 19:31:41 +03:00
43e65a51d1 Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json" 2021-05-24 19:22:20 +03:00
b8dd8b3048 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-24 19:07:46 +03:00
1e954b15d7 Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json" 2021-05-24 19:05:29 +03:00
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
6bdfbed088 Web: Settings: Backup: Added translations for placeholder. 2021-05-22 17:16:06 +03:00
ae77994689 Web: Settings: Backup: Added error handler fro third-paty resource for manual backup. 2021-05-22 16:44:44 +03:00
Artem Tarasov
098e04891c Web: deleted "WhiteLabel" translation key 2021-05-22 01:31:50 +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
c664e80ae8 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-21 17:39:01 +03:00
9960cef423 Web: Removed useless translations "OwnerSettings", "PortalSecurity", "ProductsAndInstruments" 2021-05-21 17:38:55 +03:00
b0bc8ec720 Web: Removed useless translations (DataManagement, DeactivationDeletionPortal, GreetingSettingsTitle, GreetingTitle, LoginHistoryNav) 2021-05-21 17:31:03 +03:00
66b30360de Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-21 17:21:16 +03:00
389ee969a2 Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json" 2021-05-21 17:19:00 +03:00
81febda210 Web: Removed useless translations "CommunityUserCapability", "CrmProduct", "CRMUserCapabilityCreate", "CRMUserCapabilityEdit" 2021-05-21 17:04:16 +03:00
d6a5041c3d Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 16:38:23 +03:00
facf0a01cf Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json" 2021-05-21 16:37:46 +03:00
8e889049c2 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 15:03:19 +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
5afe35f58f Web: Removed useless translations 2021-05-21 14:24:16 +03:00
53419df9d1 Web: Removed useless translations "ProjectsUserCapabilityCreate", "ProjectsUserCapabilityForm", "ProjectsUserCapabilityTrack", "ProjectsUserCapabilityView" 2021-05-21 14:11:21 +03:00
989f74af52 Web: Removed useless translations 2021-05-21 13:36:02 +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
bebc5ce03a Web: Moved translationKey "Documents" to "/static/locales/{lng}/Common.json" 2021-05-21 11:12:03 +03:00
eb7f493304 Web: Moved translationKeys "RequiredField" and "FullAccess" to "/static/locales/{lng}/Common.json" 2021-05-21 11:05:37 +03:00
cc2bb50862 Web: Resolved NotFoundKeysTest issues 2021-05-21 10:31:32 +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
2415c485bb Web: Settings: Backup: Fixed showing data if auto backup is disable. 2021-05-20 23:25:08 +03:00
fd0620993f Web: Settings:Backup: Deleted checkbox and Refactoring. 2021-05-20 20:29:17 +03:00
94b3ed0041 Web: Settings: Backup: Added radio button selecting to the manual backup and added possibility to select type of storage. 2021-05-20 20:12:54 +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
0b76ceabc0 Web: Settings: Backup:
- Added floating button for third-party storage
- Preventing memory leaks
- Preventing toasters from repeating
2021-05-20 14:56:16 +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
a1fecc4b54 Web: Settings: Backup: Fixed third-party storage select. 2021-05-20 11:08:15 +03:00
63060f395a Web: Settings: Backup: Fixed disable options for third-party storage. 2021-05-20 10:41:56 +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
2520544ad0 Web: Settings: Backup: Added possibility to disable options and added logic for third-party storage for manual backup. 2021-05-19 15:34:26 +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
23ad6edc36 Web: Settings: Backup: Refactoring third-party storage. 2021-05-19 10:51:57 +03:00
b772c4b0f9 Web: Settings: Backup: Fixed combo-box and input width for third-party storage. 2021-05-19 09:40:31 +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
c24fe6a9ab Web: Settings: Backup: Added possibility to set loading for outside components. 2021-05-18 11:19:55 +03:00
84d9eebce9 Web: Settings: Backup: Fixed selected folder when user changed only options for third-party recourse. 2021-05-18 11:17:25 +03:00
1d9c301ec0 Web: Settings: Backup: Added toastr after manual coping. 2021-05-18 11:00:15 +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
72a680df37 Web: Settings: Backup: Refactoring. 2021-05-18 10:42:39 +03:00
56a99dab66 Web: Settings: Backup: Fixed showing sub folders of third-party resources. 2021-05-17 17:29:46 +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
8d971cc286 Web: Settings: Backup: Refactoring. 2021-05-17 14:46:01 +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
54fa2309f4 Web: Settings: Backup: Added possibility to set loading for components outside the OperationsDialog. 2021-05-14 17:51:34 +03:00
41d37ddac6 Web: Settings: Backup: Added loader for radio button when user will try to save changes. 2021-05-14 17:32:10 +03:00
Alexey Kostenko
64f70c1bd0 Web: Client: Added translations 2021-05-14 17:22:45 +03:00
daeb12d31b Web: Settings: Backup: Added loader for automatic backup and loader for combo box when user save changes. 2021-05-14 17:19:40 +03:00
436eb3558f Web: Settings: Backup: Fixed loading for third-party storage. 2021-05-14 17:11:26 +03:00
Alexey Kostenko
663417d14b Web: Client: Configuring access rights to modules, small refactoring 2021-05-14 17:05:39 +03:00
fe434db267 Web: Settings: Added loader for third-party storage module. 2021-05-14 16:55:32 +03:00
93fd1d09ac Web: Settings: Backup: Added error handler when user try to save third-party storage with empty value of inputs. 2021-05-14 16:42:31 +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
bb95aec345 Web: Settings: Backup: Added create schedule backup for third-party storage. 2021-05-14 15:46:04 +03:00
124ea0aa5c Web: Client: fixed translates 2021-05-14 13:58:21 +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
39ebe87b43 Web: Settings: Backup: Removed storage parameters to the function. 2021-05-14 11:00:53 +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
9f245e1b6b Web: Settings: Backup: Fixed styles. 2021-05-13 15:03:47 +03:00
Artem Tarasov
811a41bbc5 Web: Client: fixed position version badge 2021-05-13 14:04:40 +03:00
636b3e5518 Web: Settings: Backup: Fixed checked function. 2021-05-13 12:15:55 +03:00
d72b272fe4 Web: Settings: Backup: Added error handler when try to save third-party resource settings with empty input. 2021-05-13 11:56:47 +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
e531ff2292 Web: Settings: Backup: Fixed translation. 2021-05-12 19:55:48 +03:00
Alexey Kostenko
7ae752b86e Web: Client: Added ModalDialog, removed unused code 2021-05-12 16:51:50 +03:00
71fa3399bc Web: Settings: Backup: Added showing save and cancel button when select a folder and Added base folder path when click on cancel button. 2021-05-12 16:03:06 +03:00
Alexey Kostenko
3694d3a251 Web: Client: PeopleSelector moved from header to admins page 2021-05-12 13:36:09 +03:00
dd6d72770e Web: Settings: Backup: Fixed showing save and cancel button. 2021-05-12 11:38:22 +03:00
c09ca3f778 Web: Settings: Backup: Added showing save and cancel button when is something changed. And rename folder for manual backup. 2021-05-12 11:01:58 +03:00
Alexey Kostenko
6672b6c4f3 Web: Client: Fixed mobile view on admins page 2021-05-11 13:36:12 +03:00
c857751572 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	yarn.lock
2021-05-11 12:22:17 +03:00
Alexey Kostenko
62c789d68b Merge branch 'develop' into feature/access-rights-admins 2021-05-11 10:19:31 +03:00
8f6bcf6e68 Web: Client scripts optimizations:
+ Fix deploy script (xcopy not installed issue)
+ Added concurrently for build and deploy scripts
+ Added new packages "mkdirp" (original "mkdir" not working with yarn run <script>), "rimraf"
+ Added missing "terser-webpack-plugin" package
2021-05-07 20:59:39 +03:00
3ae370deed Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-05-07 18:54:42 +03:00
6c3244a3e9 Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy) 2021-05-07 18:54:25 +03:00
7541e4bfe5 * Web:Settings: Backup: Added create schedule at document module, added information about created schedule for documents module and Refactoring. 2021-05-07 16:23:46 +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
143245c0c5 Web: Settings: Backup: Added available fields for third-party storage. 2021-05-07 12:31:42 +03:00
4bcfc47f2d Web: Settings: Backup: Fixed styles. 2021-05-06 14:51:42 +03:00
6aca6e9944 Web: Settings: Backup: Added third party storage component. 2021-05-06 14:42:31 +03:00
5216ab5b6d Web: Fixed ModalDialog component styles 2021-05-06 12:51:32 +03:00
0f07cdb9e9 Web: Settings: Backup: Added learn more ink to the third party resource component. 2021-05-06 12:41:58 +03:00
d6ceb06505 Web: Settings: Backup: Added copying for third party resource module. 2021-05-06 12:22:54 +03:00
16f336a169 Web: Added thirdPartyModule component. 2021-05-06 12:06:54 +03:00
a9a13d1346 Web: Refactoring & optimization. 2021-05-06 11:32:33 +03:00
88923a5e4d Web: Fix build static bundle 2021-05-05 20:30:54 +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
d3eac61e1e Web: Settings: Backup: Added delete schedule backup. 2021-05-04 16:01:44 +03:00
5b15461225 Web: Settings: Backup: Added logic for copying backup to documents module, added error processing, added toastr when copying is success. 2021-05-04 15:07:16 +03:00
3a564d76d0 Web: Settings: Backup: Added disable to save changes at Automatic backup when is copying to the temporary storage. 2021-05-04 12:00:05 +03:00
c8ab20f6a4 Web: Settings: Backup: Added logic for temporary storage. 2021-05-04 11:18:12 +03:00
Alexey Kostenko
f9e04eb8d5 Web: Client: Removing admins 2021-04-30 15:57:43 +03:00
9f3f03a963 Web: added store to webpack.config, fixed Firefox store problems 2021-04-30 15:19:11 +03:00
b6881cd403 Web: Added check for connecting a third-party resource: input is disabled if user didn't connecting a third-party resource. 2021-04-30 11:27:27 +03:00
b8460209d3 Web: Components/Settings: Refactoring. 2021-04-30 10:35:02 +03:00
3ede66f9cd Web: Settings: Backup: Added input with folder path. Added panel with only common documents. 2021-04-29 19:39:35 +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
99482bf384 Web: Settings: Backup: Added checkbox to schedule component. 2021-04-28 17:12:16 +03:00
462c2d7a5a Web: Settings:Backup: Added max copies option. 2021-04-28 16:59:02 +03:00
6220e70bf7 Web: Settings: Backup: Added third party resource and storage. 2021-04-28 15:21:42 +03:00
0ddeac00a3 Web: Settings: Backup: Added week and month options. 2021-04-28 14:38:16 +03:00
fc4a58966c Web: Bumped version to 0.1.9 2021-04-28 14:03:59 +03:00
8fc80a419b Merge branch 'develop' into feature/translations 2021-04-28 13:08:52 +03:00
71b69c3560 Web: Client: fixed after merge 2021-04-28 11:42:12 +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
6c51ae8a15 Merge branch 'develop' into feature/translations 2021-04-27 13:59:58 +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
db1f883005 Bump version v0.1.8 2021-04-26 18:59:33 +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
98bef7c15d Web: Settings: Added common documents storage. 2021-04-25 22:23:59 +03:00
c47f896f75 Client: added translations 2021-04-24 10:42:49 +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