Commit Graph

14469 Commits

Author SHA1 Message Date
14279575c6 Web: Renamed function. 2021-09-28 17:57:51 +03:00
fcb6e86f73 Web: Renamed function. 2021-09-28 17:56:02 +03:00
b8ff015632 Web: Created a reusable generic copy function for storages. 2021-09-28 17:53:26 +03:00
6b1aaca6b6 Web: Deleted useless code. 2021-09-28 15:55:40 +03:00
6476204040 Web: Created a reusable generic copy function for modules. 2021-09-28 15:51:55 +03:00
c6041b1972 Web: Fixed showing files list row for backup list, removed checkbox for backup list. 2021-09-28 13:42:52 +03:00
856ae813f8 Web: Files: Set for first load to false to display folders as a tree. 2021-09-28 12:07:50 +03:00
d3eafd0186 Web: Fixed after merge, deleted useless files after merge. 2021-09-28 12:02:20 +03:00
6b0bf36a31 Web: Files: Fixed after merge. 2021-09-21 10:21:12 +03:00
4d14287590 fix backup 2021-09-20 21:30:29 +03:00
ec40bcc828 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-09-20 16:27:28 +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
0d50909bb7
Merge pull request #343 from ONLYOFFICE/feature/header-menu-items
Feature/header menu items
2021-09-20 16:01:47 +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
c22c337b9a WEb: Files: Removed deleted option when the user selects files one of which does not have permission to delete. 2021-09-20 15:17:38 +03:00
42f6216149 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
2021-09-20 15:17:21 +03:00
477ed8d76f Web: Files: Added Restore option for Recycle Bin folder. 2021-09-20 15:09:50 +03:00
a57b25c8e2 Web: Files: Fixed options for Privacy folder. 2021-09-20 15:08:34 +03:00
2933267f7f Web: Files: Added "Removed from list" for share folder. 2021-09-20 14:59:27 +03:00
0a5a081a28 Web: Files: Removed possibility to delete in Common folder when user is not admin of files module. 2021-09-20 14:55:38 +03:00
238eb7aa40 Web: Files: Fixed conditions. 2021-09-20 14:06:55 +03:00
ebd36bb201 Web: Files: Fixed showing options. 2021-09-20 12:46:05 +03:00
56b92fb173 Merge branch 'feature/header-menu-items' of github.com:ONLYOFFICE/AppServer into feature/header-menu-items 2021-09-20 11:55:47 +03:00
fe4e1dbfb0 Web: Files: Renamed function. 2021-09-20 11:55:28 +03:00
77355533dd
Merge branch 'develop' into feature/header-menu-items 2021-09-20 11:16:56 +03:00
3b5af74eac
Merge pull request #342 from ONLYOFFICE/feature/filtered-header-menu
Feature/filtered header menu
2021-09-20 11:16:11 +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
90a9575c26
Merge pull request #340 from ONLYOFFICE/bugfix/open-media-history-version
Bugfix/open media history version
2021-09-20 10:24:19 +03:00
8b46721228 Web: Files: Refactoring. 2021-09-20 08:57:26 +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
3c5d896da6 Web: Refactoring. 2021-09-20 08:24:12 +03:00
6a87a3152a Web: Files: Removed options not available for interaction for the header menu. 2021-09-17 19:35:24 +03:00
021ab20fed fix tests 2021-09-17 18:28:50 +03:00
b75940fe49 fix 2021-09-17 18:18:34 +03:00
737efc3be7 Api: settings. Added recapthca public key 2021-09-17 17:57:22 +03:00
6233ab55a3 Personal: added register method 2021-09-17 17:32:37 +03:00
d32f555706 ResManager: fix 2021-09-17 16:46:24 +03:00
69b9692ba7 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-17 15:37:14 +03:00
73327994b0 Fix bug 52478: Client.Files: Open location in context menu 2021-09-17 15:36:35 +03:00
f5a73c66d6 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-17 15:14:41 +03:00
19b82b1ed3 Web: Returned old solution with disabled context menu item. 2021-09-17 15:14:11 +03:00
98a3696817 Web: Files: fix 2021-09-17 15:11:33 +03:00
f8848acb20 Fix bug 52618: folder open location 2021-09-17 15:08:40 +03:00
c6573c5e26 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-17 15:02:02 +03:00
463ffa9d2e Web: Files: delete separator 2021-09-17 15:01:56 +03:00
e22d88fc3d Web: Files: Deleted useless console.log. 2021-09-17 14:19:54 +03:00
13f4b9d5dd Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-17 14:09:49 +03:00
d47d33f34a Fix Bug 52609- Docs.Mobile. Version history does not open when called from the context menu. 2021-09-17 14:09:34 +03:00
b49156bcf5 Web: Files: moved cbMenuItems to store, removed unnecessary elements from the header 2021-09-17 13:03:46 +03:00