Commit Graph

7110 Commits

Author SHA1 Message Date
28cbbc1671 Web: Added allowForMe for Route My 2021-05-13 11:26:11 +03:00
6867ded281 Merge branch 'develop' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +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
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
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
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
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
37f8bdd872 Merge branch 'master' into develop 2021-05-05 20:52:06 +03:00
88923a5e4d Web: Fix build static bundle 2021-05-05 20:30:54 +03:00
a4c73548bc Web: i18n configs fix 2021-05-05 20:30:13 +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
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
026306d7ca Web: Login: Fix hard-coded list of trusted domains on registration 2021-05-04 15:35:09 +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
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
bc8ea5a3be Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-30 18:01:25 +03:00
7c1283c26f Web: Fix login redirect on Editor not authorized link opening 2021-04-30 18:01:16 +03:00
c8f48d1861 Resource: profile removed 2021-04-30 17:43:26 +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
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
b27e973ec0
Merge pull request #237 from ONLYOFFICE/feature/support-hosting-as-service
Feature/support hosting as service
2021-04-28 15:33:53 +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
631dd5034f Merge branch 'release/v0.1.8' of github.com:ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 15:55:45 +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
2b6d536590 Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 13:48:38 +03:00
932e18be1c Web: Editor: Fix display additional buttons by doc param 2021-04-27 13:48:32 +03:00
c324693034 Merge branch 'develop' into release/v0.1.8 2021-04-27 12:11:36 +03:00
Alexey Kostenko
bf963f511b Merge branch 'develop' into bugfix/thirdparty 2021-04-27 11:25:30 +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
8bb173fa92 Thirdparty: fix providers 2021-04-26 21:42:39 +03:00
d97928fd37 Merge branch 'develop' into feature/support-hosting-as-service 2021-04-26 19:52:32 +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
98bef7c15d Web: Settings: Added common documents storage. 2021-04-25 22:23:59 +03:00
a66a454462 Settings: added tfaapp method 2021-04-25 18:06:56 +03:00
6d2f417c5c Method GetAuthProviders moved to PeopleController 2021-04-25 11:46:44 +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
cd699e37e2 Files: Fix opening of version 2021-04-23 18:00:05 +03:00
2d8b085d02 add support WindowsService/systemd for IHostBuilder
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
fc39307489 Web: Fixed translation. 2021-04-23 10:32:43 +03:00
TatianaLopaeva
1f8039f1b7 Web: Added storages to the Manual page. 2021-04-22 19:26:35 +03:00
553ac70278 Bump version v0.1.7 2021-04-22 14:13:12 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
TatianaLopaeva
b2102d9e61 Web: Added common settings. 2021-04-22 09:58:02 +03:00
TatianaLopaeva
e4368caa63 Web: Added Restore Date. 2021-04-22 09:56:54 +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
79d005809b Web: Settings: Added Automatic and Manual backup pages. 2021-04-21 14:11:10 +03:00
TatianaLopaeva
d4beb848a1 Web: Settings: Added data-management option to the settings tree and Added Backup page. 2021-04-21 11:14:43 +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
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
36c65c1c43 Bump version v0.1.6 2021-04-19 18:41:27 +03:00
6c8654ba77
Merge branch 'develop' into feature/team-template 2021-04-19 16:47:52 +03:00
TatianaLopaeva
224bee68b4 Web: Settings: Added tabIndex. 2021-04-19 16:46:15 +03:00
Alexey Kostenko
1627490b05 Merge branch 'develop' into feature/access-rights-new 2021-04-19 16:21:38 +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
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
Alexey Kostenko
03ec607cbf Merge branch 'develop' into feature/oauth2.0 2021-04-19 08:25:42 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +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
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +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