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
7ad62ded2b
Auth: fix confirm
2021-05-13 14:02:33 +03:00
636b3e5518
Web: Settings: Backup: Fixed checked function.
2021-05-13 12:15:55 +03:00
d01db1eed6
Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
...
# Conflicts:
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
# common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/services/ASC.Data.Backup/BackupAjaxHandler.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-13 11:57:40 +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
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
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
198f1e4fe6
Settings: fixed tfaapp/confirm
2021-05-11 22:30:37 +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
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
07c6749243
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-05 15:59:01 +03:00
90117eb6f8
Auth: setCookies
2021-05-05 15:57:12 +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
261e6d8b4c
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-05 15:09:59 +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
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
c86257cf67
Merge branch 'develop' into feature/crm-migrate
2021-05-04 11:25:27 +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
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
8816e535c1
merge from develop
2021-04-28 19:50:59 +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
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
38ed10ccb8
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-04-28 11:13:01 +03:00
f53eef184f
Tfa: added tfaapp/setup method for receiving code and image
2021-04-27 20:31:05 +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
6c51ae8a15
Merge branch 'develop' into feature/translations
2021-04-27 13:59:58 +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
5777f0abd4
Settings: confirm url
2021-04-27 13:41:32 +03:00
6114d960e3
Auth: AuthenticateMe added ConfirmUrl
2021-04-27 13:40:25 +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
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
f11f18dffb
Auth: check tfa
2021-04-26 14:56:38 +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
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
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
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
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
fc39307489
Web: Fixed translation.
2021-04-23 10:32:43 +03:00
Alexey Kostenko
c430e983b4
Web: Client: Added admins page
2021-04-23 08:22:58 +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
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
Alexey Kostenko
03ec607cbf
Merge branch 'develop' into feature/oauth2.0
2021-04-19 08:25:42 +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
Viktor Fomin
62edc883db
Web: Client: add translations
2021-04-18 23:34:26 +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
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
2f38b2ec33
Settings: fixed custom schemaName
2021-04-14 21:08:27 +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
TatianaLopaeva
5a3f14d6fd
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-14 16:34:03 +03:00
038fd58d7c
Settings: fixed custom schemaName
2021-04-14 16:21:37 +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
Viktor Fomin
dd4ca59e66
Web: Client: add translations
2021-04-14 15:23:03 +03:00
fdc5ee0838
Settings: fixed custom name settings
2021-04-14 15:03:08 +03:00
TatianaLopaeva
88ed42bcfe
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-14 15:03:00 +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
a30915f618
Settings: post and put customschemas
2021-04-13 21:11:38 +03:00
783a5f2b37
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-13 20:10:32 +03:00
0df4b998d1
Api: removed SchemaItemModel
2021-04-13 20:10:14 +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
TatianaLopaeva
73d113e26f
Wen: Settings: Added translation.
2021-04-13 14:28:36 +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
3b94348cf5
Web: Settings: Fixed translation.
2021-04-12 15:59:20 +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
2c0dd28ad4
Merge branch 'develop' into bugfix/files-panel
2021-04-12 12:09:33 +03:00
Alexey Kostenko
cf7072a714
Refactoring
2021-04-12 10:57:21 +03:00
Alexey Kostenko
0e4e7debac
Web: Login: Show facebook button first
2021-04-12 10:26:46 +03:00
Alexey Kostenko
6a6e4c4705
Web: Login: Added translations
2021-04-09 16:01:04 +03:00
Alexey Kostenko
e187db767f
Web: Login: Updated field with buttons for login
2021-04-09 16:00:41 +03:00
95352a2116
Bump version v0.1.3
2021-04-09 11:02:13 +03:00
Alexey Kostenko
b017562eaf
Web: Changed facebook icon
2021-04-09 10:30:54 +03:00
b66008b33e
Bump version v0.1.2
2021-04-08 20:00:15 +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
bcf350c1d9
Bump version to v0.1.1
2021-04-08 10:23:33 +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
ee6ffd3ace
Updated packages
2021-04-06 20:16:24 +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
Alexey Kostenko
df635f3bfd
Web: Login/Common: Clear interval if getter token window is closed
2021-04-04 16:39:35 +03:00
Alexey Kostenko
0647881975
Web: Login: Removed unnecessary method
2021-04-04 15:54:32 +03:00
Alexey Kostenko
aadb8e3827
Web: Login: Show notification if account not connected to provider
2021-04-02 13:06:27 +03:00
TatianaLopaeva
f79f75f6db
Merge branch 'develop' into feature/EditorIntegration
2021-04-01 16:42:33 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
TatianaLopaeva
8f8a0d2f44
Web: Editor: Deleted useless props.
2021-04-01 11:50:30 +03:00
TatianaLopaeva
386529c6fd
Merge branch 'develop' into feature/EditorIntegration
...
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
2021-04-01 10:17:14 +03:00
18b4fba15a
Merge branch 'develop' into feature/dotnet5
2021-03-31 20:38:05 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room
2021-03-31 18:01:58 +03:00
TatianaLopaeva
33b165fd40
Web: Files/Editor: Added SharingDialog.
2021-03-31 16:49:14 +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
TatianaLopaeva
2a2b6cd1ac
Web: Editor: Refactoring.
2021-03-30 18:21:36 +03:00
TatianaLopaeva
af379ac72f
Web: Editor: Deleted useless console.log.
2021-03-30 15:48:08 +03:00
TatianaLopaeva
dea731dfa7
Web: Files/Editor: Deleted useless code.
2021-03-30 15:44:45 +03:00
TatianaLopaeva
1531a37951
Web: Editor: Fixed displaying of toast.
2021-03-30 14:03:43 +03:00
Alexey Kostenko
0f5e5cce3f
Web: Components/People/Login: Fixed warning ("React does not recognize prop")
2021-03-30 11:37:21 +03:00
TatianaLopaeva
dc0baec941
Web: Editor/Files: Fix displaying of shared user list at Shared Panel & Refactoring.
2021-03-30 10:21:30 +03:00
Alexey Kostenko
b8c7be90ae
Web: Client: Removed ThirdPartyResponseRoute, handling third party response in static file
2021-03-30 07:50:45 +03:00
TatianaLopaeva
005d6759e9
Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located.
2021-03-29 19:31:11 +03:00
TatianaLopaeva
c4bcb8772c
Web: Files/Editor: Added additional conditions for access to the sharing panel and updated conditions for the custom filter.
2021-03-28 22:59:36 +03:00
TatianaLopaeva
5ccb86abeb
Web: Editor/Files: Refactoring & Moved icon to the common folder for icons.
2021-03-28 21:38:48 +03:00
TatianaLopaeva
88392ffd56
Web: Editor/Files: Refactoring.
2021-03-28 19:21:08 +03:00
TatianaLopaeva
89dbfd1f54
Web: Editor/Files: Fixed share email from the Editor.
2021-03-28 18:47:04 +03:00
TatianaLopaeva
5d1e2f0e4c
Web: Editor: Added condition that don't change access when user can't edit.
2021-03-28 18:13:59 +03:00
TatianaLopaeva
40218e944e
Web: Editor: Added goBack button to the files.
2021-03-28 17:49:51 +03:00
TatianaLopaeva
7fba6003a2
Web: Editor: Added list of access rights when Editor initialized and access doesn't changed yet.
2021-03-26 18:27:30 +03:00
TatianaLopaeva
c417709197
Web: Editor: Refactoring.
2021-03-26 17:35:44 +03:00
Alexey Kostenko
7ff66e894a
Web: Login: Render only available providers for login
2021-03-26 17:19:26 +03:00
TatianaLopaeva
7777d05515
Web: Editor/Files: Added full list of access rights for SharingPanel to Editor.
2021-03-26 17:18:43 +03:00
Alexey Kostenko
ab3d5f1e77
Web: Login: Added icons and translations
2021-03-26 17:17:34 +03:00
TatianaLopaeva
2dba92ba28
Web: Editor/Files: Added refresh list of people and their access rights after changed at SharingPanel.
2021-03-26 15:19:55 +03:00
TatianaLopaeva
4892b39e0e
Web: Editor: Added SharingPanel.
2021-03-26 15:14:17 +03:00
TatianaLopaeva
129b066802
Web: Editor: Added mobx and mobx-react dependencies.
2021-03-26 15:05:07 +03:00
TatianaLopaeva
ff2d8a8a28
Web: Editor: Changed name space fro i18n.
2021-03-26 14:46:19 +03:00
TatianaLopaeva
2e44d28957
Added translate for access rights.
2021-03-26 14:43:50 +03:00
65e1c72c01
Sln: fixed packages
2021-03-26 12:26:12 +03:00
18a2c0a53d
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +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
97fa6c82ab
Web: Editor: webpack: disabled compression
2021-03-23 19:34:18 +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
b0c430b7ba
Merge branch 'develop' into feature/workspaces
2021-03-22 19:46:49 +03:00
950506a59c
calendar: migrate extension for DateTime
2021-03-22 19:13:15 +03:00
7c96b2f625
core: migrate several interfaces
2021-03-22 19:04:37 +03:00
e4897160a9
fixed SendEmailActivationInstructions
2021-03-22 18:56:04 +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
89f2431e1c
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:33:50 +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
b6a5249147
Web: Editor: Add URL proxy
2021-03-22 12:12:34 +03:00
Viktor Fomin
d3fdc2d8a3
Web: Client: fixed greeting settings
2021-03-22 11:57:08 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +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
fc7bd11088
Fix getshortenlink
2021-03-21 18:29:35 +03:00
335cc31939
Notify: fix
2021-03-21 17:51:49 +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
330c156cb8
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:20:31 +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
6e2b2d5095
Web: Removed old svg
2021-03-17 21:26:28 +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
f56970ed15
Web: Login: Fixed base urls
2021-03-17 12:48:22 +03:00
391b60c79d
Web: Login: Commented logs
2021-03-17 12:47:49 +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
145d720299
Web: Webpack: Added base url and commented proxy
2021-03-13 18:31:09 +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
e8e1a176ea
Update yarn.lock files
2021-03-12 18:38:55 +03:00
94b6750a6b
web: common: bump version
2021-03-12 18:28:14 +03:00
22c3cfffcd
Web: Restored defaultPage
2021-03-12 18:27:52 +03:00