Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
570ede7bba
Merge branch 'develop' into feature/11.5.2
...
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785
Web: Bumped version to 0.1.10
2021-05-29 21:26:13 +03:00
d0bbcb8d5a
Files: moved from 08a01422
2021-05-28 11:22:35 +03:00
527a650601
WebStudio: resources
2021-05-27 21:30:15 +03:00
bda786f844
WebStudio: moved from 08a01422
2021-05-27 20:13:24 +03:00
d8adef733c
ASC.Files: moved from 08a01422
2021-05-26 16:54:46 +03:00
Artem Tarasov
1aba7c5dbe
Web: Client: Settings: fixed max-width for unselected TreeNode
2021-05-25 19:17:17 +03:00
f6fbe33814
Web.Core: moved from 08a01422
2021-05-24 20:41:31 +03:00
90c67cac13
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
2021-05-24 13:26:13 +03:00
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +03:00
Artem Tarasov
b9d7afb332
Web: Client: Settings: fixed selected tree node style
2021-05-21 01:16:22 +03:00
Artem Tarasov
c6fa305b30
Web: Client: NavMenu: fixed postition version-box
2021-05-20 18:38:50 +03:00
354841442e
Web: Editor: Fixed shell name
2021-05-20 14:21:26 +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
Artem Tarasov
d17887eabc
Web: Client: NavMenu: fixed appearance of the cursor when hovering over profile icon
2021-05-20 01:48:06 +03:00
Artem Tarasov
5996b3f74f
Merge branch 'develop' into bugfix/fixed-styles
2021-05-20 01:00:36 +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
536c6c2f5e
Web: Moved custom.scss to @appserver/common
...
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
3433c074d7
Merge branch 'develop' into feature/my-profile
...
# Conflicts:
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-05-19 10:16:40 +03:00
b9c52c526e
Fixed DistributedTask
2021-05-18 21:24:22 +03:00
8a3db93d0d
Backup: moved from 08a01422
2021-05-17 21:27:39 +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
Artem Tarasov
811a41bbc5
Web: Client: fixed position version badge
2021-05-13 14:04:40 +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
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
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
5216ab5b6d
Web: Fixed ModalDialog component styles
2021-05-06 12:51:32 +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
026306d7ca
Web: Login: Fix hard-coded list of trusted domains on registration
2021-05-04 15:35:09 +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
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
