IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,797 Commits 40 Branches 22 Tags 420 MiB
4632b44767
Commit Graph

11410 Commits

Author SHA1 Message Date
MaksimChegulov
4632b44767 optimized updating new tags 2023-08-30 14:13:18 +03:00
MaksimChegulov
4eb5aaa2c0 added batch tag insertion 2023-08-29 13:08:25 +03:00
MaksimChegulov
a93aaa2a1c increased performance in access checking 2023-08-29 12:15:47 +03:00
MaksimChegulov
c2b1b5cf90 split UserOrGroup subject type 2023-08-29 12:11:46 +03:00
MaksimChegulov
e51afe903e optimized check for full access to room 2023-08-29 11:48:32 +03:00
pavelbannov
e435a1ba3a Files: fixed removing folders 2023-08-21 18:57:26 +03:00
pavelbannov
628efca83f Files: fixed restore from trash 2023-08-21 18:41:13 +03:00
pavelbannov
41b0062c23 Merge branch 'develop' into feature/region-audit 2023-08-21 12:51:52 +03:00
Alexey Bannov
720a2817f8 fix bug 63687: added rate limiting for api 2023-08-18 18:47:23 +03:00
Pavel Bannov
68a6f0af3a
Merge pull request #1623 from ONLYOFFICE/feature/add-apimethod-settings/autocleanup 
Feature/add apimethod settings/autocleanup
 2023-08-16 02:39:24 -07:00
Ilya Oleshko
e531654c54 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
 2023-08-11 12:47:44 +03:00
Anton Sukhorukov
1a4551eec2 Merge branch 'develop' into feature/add-apimethod-settings/autocleanup 2023-08-11 10:48:57 +03:00
Alexey Bannov
32fc662a85 backend: updated some dll 2023-08-10 19:16:25 +03:00
Anton Sukhorukov
9b74f49359 refactoring 2023-08-10 16:19:48 +03:00
Anton Sukhorukov
2717845905 add HttpGet("settings/autocleanup") 2023-08-09 17:08:01 +03:00
Alexey Bannov
e427f70709 backend: updated some dll 2023-08-08 19:43:14 +03:00
Alexey Golubev
2a7b044307
Merge hotfix/1.1.2 into hotfix/v1.1.2 
Merge hotfix/1.1.2 into hotfix/v1.1.2
 2023-08-07 15:42:56 +03:00
pavelbannov
e80fd2a74e fixed ArgumentOutOfRangeException 2023-08-04 17:42:14 +03:00
Andrey Savihin
c2e284f110 fix Bug 63538 2023-08-04 17:30:58 +03:00
Maria-Sukhova
2b2c9b0c25 added translations 2023-08-04 17:07:12 +03:00
pavelbannov
e4c3783317 fix Bug 63553 2023-08-04 14:24:43 +03:00
Natalia
c889ebed66 added api docs 1.1.1 
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UrlShortenerFakeDbContext.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
 2023-08-04 13:59:06 +03:00
Natalia
6c1edce8c6 added api docs 1.1.1 2023-08-03 16:50:57 +03:00
pavelbannov
2b28b6a33e bug 63454 : logging 2023-08-03 13:16:50 +03:00
pavelbannov
d8d864692a fix bug 63390 2023-08-02 20:02:38 +03:00
pavelbannov
a9e609e57d revert 78c6719a03 2023-08-02 20:00:25 +03:00
Pavel Bannov
06777b395a
Merge pull request #1600 from ONLYOFFICE/feature/api-descriptions 
Feature/api descriptions
 2023-08-02 08:09:52 -07:00
pavelbannov
c360f224cf Merge branch 'develop' into feature/refactoring-nlog 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	config/nlog.config
 2023-08-02 16:52:12 +03:00
Pavel Bannov
4d2254d870
Merge pull request #1599 from ONLYOFFICE/feature/api-develop 
Feature/api develop
 2023-08-02 04:11:18 -07:00
pavelbannov
a52f889884 Files: fixed MoveOrCopyBatchCheckFullAsync 2023-08-02 12:53:33 +03:00
Ilya Oleshko
12558b8520 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	packages/client/src/components/Article/Body/index.js
#	packages/client/src/components/panels/OperationsPanel/index.js
#	packages/client/src/pages/About/AboutContent.js
#	packages/client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	yarn.lock
 2023-08-01 17:56:22 +03:00
Sergey Linnik
34a675c62c api: fix documentation 2023-08-01 17:50:47 +03:00
Sergey Linnik
b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
 2023-08-01 17:07:05 +03:00
Ilya Oleshko
51fb13d035 Merge branch 'master' into develop 
# Conflicts:
#	packages/client/src/pages/Files.jsx
#	packages/common/components/Navigation/Navigation.js
#	packages/common/components/Navigation/sub-components/control-btn.js
#	packages/common/components/Navigation/sub-components/plus-btn.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	yarn.lock
 2023-08-01 14:39:31 +03:00
Sergey Linnik
df20e9e624 api: fix documentation 2023-08-01 11:53:00 +03:00
Sergey Linnik
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
 2023-08-01 11:39:57 +03:00
pavelbannov
c75ddfcd18 bug 63454: logging 2023-07-31 16:51:33 +03:00
pavelbannov
1e1551f9c0 fix Bug 63497 2023-07-31 11:59:43 +03:00
pavelbannov
31a50762b0 Merge branch 'develop' into features/migrate-urlShortener 
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
 2023-07-26 18:34:33 +03:00
pavelbannov
f967962c21 fix 2023-07-26 18:05:09 +03:00
MaksimChegulov
7c7f52e51c added ignore pdf download restriction 2023-07-26 16:51:22 +03:00
pavelbannov
028b63213c Merge branch 'develop' into features/migrate-urlShortener 
# Conflicts:
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs
#	migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs
#	migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
 2023-07-26 14:30:00 +03:00
pavelbannov
ccf13cf375 fix Bug 63454 2023-07-25 19:25:51 +03:00
pavelbannov
78c6719a03 bug 63390 2023-07-25 18:12:08 +03:00
gopienkonikita
7d727e0842 Merge branch 'develop' into feature/public-room 
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/components/panels/UploadPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
 2023-07-25 13:01:21 +03:00
MaksimChegulov
9412c59d83 Files: ExternalShare: added Shared property 2023-07-24 14:13:43 +03:00
pavelbannov
e32679287c fix 2023-07-21 17:04:48 +03:00
pavelbannov
f503ea5d7f fix 2023-07-21 17:02:33 +03:00
pavelbannov
997ce4945c Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge 2023-07-21 16:52:02 +03:00
pavelbannov
545bacfaf0 Merge branch 'develop' into fix-conflicts-merge 
# Conflicts:
#	packages/client/src/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/FileShareOptions.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
 2023-07-21 16:51:49 +03:00