|
335eaeaba7
|
Web: Common: Added third party storages enum.
|
2021-09-28 18:10:11 +03:00 |
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
225258eec0
|
Merge branch 'develop' into feature/header-menu-items
# Conflicts:
# products/ASC.Files/Client/src/store/FilesActionsStore.js
|
2021-09-20 15:24:31 +03:00 |
|
|
31c57c4cf7
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-20 11:03:29 +03:00 |
|
|
f581f90d95
|
Web: Components: fixed table resize
|
2021-09-20 11:03:21 +03:00 |
|
|
f183d91992
|
Web: Components: Added update the "More items" length when adding new properties that do not fit to the full width of the menu header.
|
2021-09-20 08:38:45 +03:00 |
|
|
19b82b1ed3
|
Web: Returned old solution with disabled context menu item.
|
2021-09-17 15:14:11 +03:00 |
|
|
d712c7446a
|
Web: Components: fix
|
2021-09-16 14:12:21 +03:00 |
|
|
ef40908652
|
Web: Components: rewrite fill on class
|
2021-09-16 13:42:57 +03:00 |
|
|
4c210a804d
|
Web: Components: fixed cursor
|
2021-09-16 13:01:30 +03:00 |
|
|
d0973d8a86
|
Web: Components: add fill select row
|
2021-09-16 12:56:04 +03:00 |
|
|
bda448b222
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-16 10:11:51 +03:00 |
|
|
a1a819a3fa
|
Fix Bug: Inaccessible items should not be displayed in the checkbox of the menu.
|
2021-09-16 10:11:44 +03:00 |
|
|
b88a6f5ddf
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-15 15:56:28 +03:00 |
|
|
3c77982f4a
|
Fix Bug 51819 Web: Editor. Fixed openEdit
|
2021-09-15 14:52:36 +03:00 |
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
e2f977ce17
|
Merge branch 'develop' into feature/optimization
|
2021-09-15 11:47:29 +03:00 |
|
|
03d8d560ba
|
Web: Hide internal login from personal mode
|
2021-09-14 16:44:39 +03:00 |
|
|
9f33461d38
|
Web: Components: fix color banner button
|
2021-09-14 16:03:21 +03:00 |
|
|
c4b31263e8
|
Web: Components: fix tree node font size
|
2021-09-14 13:51:37 +03:00 |
|
|
fe2cf74350
|
Web: Common: fix headline font size
|
2021-09-14 13:46:15 +03:00 |
|
|
52dfeaa6e7
|
Web: Disabled body selection for macOS (for touchpad).
|
2021-09-14 12:28:13 +03:00 |
|
|
79b778c36d
|
Merge branch 'develop' into feature/new-campaigns
|
2021-09-14 11:48:24 +03:00 |
|
|
41f6a13888
|
Web: Components: fix toastr
|
2021-09-13 16:18:54 +03:00 |
|
|
1a257fcf0b
|
Web: Fix empty error toast
|
2021-09-13 14:58:20 +03:00 |
|
|
40f162aca4
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-13 12:59:53 +03:00 |
|
|
f06e3c076b
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
|
2021-09-13 12:54:59 +03:00 |
|
|
c7ad040293
|
Web: Sorted all "package.json" files by vscode-sort-package-json
|
2021-09-13 12:36:07 +03:00 |
|
|
38242e83c1
|
Web: Moved other common dependencies to sharedDependencies.js
|
2021-09-13 12:29:44 +03:00 |
|
|
74011d7328
|
Fixed Bug 52443 - Client.Files. Fixed downloadAs action
|
2021-09-13 11:09:59 +03:00 |
|
|
a47c73b5ce
|
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
|
2021-09-10 16:50:23 +03:00 |
|
|
956c9b3467
|
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
|
2021-09-10 15:57:14 +03:00 |
|
|
d2f3c93c14
|
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
|
2021-09-10 15:15:51 +03:00 |
|
|
46161eef95
|
Web: Moved axios to sharedDependencies.js
|
2021-09-10 14:49:20 +03:00 |
|
|
f0c7a09a6c
|
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
|
2021-09-10 14:20:19 +03:00 |
|
|
b70a9cd115
|
Web: Common: Fixed response for response type "text".
|
2021-09-10 11:52:06 +03:00 |
|
|
c8772bac0f
|
Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-09-09 17:29:09 +03:00 |
|
|
b4661539ec
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-09 13:06:12 +03:00 |
|
|
2c80148662
|
Web: Components: Fixed icons location for macOS/iOS.
|
2021-09-09 13:05:56 +03:00 |
|
|
efd4302538
|
Web: Components: Fixed toastr icon location
|
2021-09-09 12:44:23 +03:00 |
|
|
18718aab93
|
Web: Updated babel packages
|
2021-09-08 17:40:31 +03:00 |
|
|
bfb85fd05f
|
Web: Removed duplicated dependency declaration (attr-accept)
|
2021-09-08 17:17:57 +03:00 |
|
|
8c6de99101
|
Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies
|
2021-09-08 16:52:56 +03:00 |
|
|
fabaaef0f9
|
Web: Updated react-toastify and extended ModuleFederationPlugin shared section
|
2021-09-08 16:28:10 +03:00 |
|
|
da606cb574
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 16:24:28 +03:00 |
|
|
899507000f
|
Web: fixed login route
|
2021-09-08 16:24:20 +03:00 |
|
|
1501c1d91e
|
FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As.
|
2021-09-08 15:46:52 +03:00 |
|
|
b0147cc811
|
Web: Removed duplicated dependency declaration (fast-deep-equal)
|
2021-09-08 15:40:38 +03:00 |
|
|
551c623541
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-09-08 14:36:10 +03:00 |
|
|
8e6fa7f5fa
|
Web: Components: added banner img loader
|
2021-09-08 10:35:36 +03:00 |
|