|
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 |
|
|
b11696f70f
|
fixes
|
2023-04-26 12:27:45 +03:00 |
|
|
aa708c8877
|
added more descriptions and data types
|
2023-04-25 19:23:54 +03:00 |
|
|
29c37cbba5
|
fix namespaces for documentation
|
2023-04-19 16:39:50 +05:00 |
|
|
1c55a0acff
|
fixes for People and Backup api docs
|
2023-04-11 13:15:59 +03:00 |
|
|
663423bbe6
|
backup: added api descriptions
|
2023-03-30 18:29:14 +03:00 |
|
|
fe91eae377
|
Fix documentation warnings
|
2023-03-29 19:25:20 +05:00 |
|
|
e1b01e2d81
|
fix methods with task and without async
|
2023-03-28 13:13:13 +03:00 |
|
|
a3800de721
|
TenantDbContext -async part1
|
2023-03-20 19:16:00 +03:00 |
|
|
405ed839bb
|
CoreDbContext -async
|
2023-03-14 23:44:44 +03:00 |
|
|
9a1404a401
|
BackupsContext - async
|
2023-03-13 19:29:42 +03:00 |
|
|
7ba557cd65
|
remove unused api methods
|
2023-01-30 11:00:00 +03:00 |
|
|
255b54b169
|
Added allow anonymous attribute.
|
2023-01-24 17:08:55 +03:00 |
|
|
143a4d01ec
|
removed unused variables
|
2022-12-09 17:47:46 +03:00 |
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
36714b4130
|
Api: added payment/request
|
2022-09-04 18:30:32 +03:00 |
|
|
eccca5ea5f
|
remove waste modules
|
2022-08-30 14:16:41 +03:00 |
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
86456159b9
|
Backup: fix registration
|
2022-04-13 19:28:58 +03:00 |
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
a976b69fc8
|
backup: refacroting. added new Integration event.
|
2022-03-02 18:25:28 +03:00 |
|
|
609427bf20
|
merge from feature/backend-refactor
|
2022-03-01 15:57:49 +03:00 |
|
|
70ed0d72b7
|
added IntegrationEventLog from eShopOnContainers template. refactoring.
|
2022-02-14 14:18:58 +03:00 |
|
|
6510927b20
|
backup: add api method enableAutoBackup
|
2022-02-09 17:39:02 +03:00 |
|
|
fd7528879d
|
backup: bugfix
|
2022-02-07 13:57:00 +03:00 |
|
|
40d56075f1
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.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.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
|
2022-02-07 12:40:50 +03:00 |
|
|
7e13b3a031
|
backup: refactoring
|
2022-01-19 19:25:10 +03:00 |
|
|
a9da66f2b5
|
backup: refactoring
|
2022-01-17 14:15:46 +03:00 |
|