f2916f2121
bug 63601
2023-08-14 21:03:39 +03:00
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
157605bc0b
ASC.Web.Api: Authentication: Setting cookies based on the session parameter
2023-07-04 14:21:19 +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
4af951856f
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.People/Server/Api/PhotoController.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/ApiModels/RequestDto/LinkAccountRequestDto.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-04-18 18:08:59 +05:00
50c3f5805a
fixes for api docs
2023-04-13 12:43:54 +03:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
aa1b712131
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.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/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
2023-03-29 19:28:15 +05:00
f882861bc6
fixes
2023-03-28 18:29:50 +03:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
734fda9329
fixes
2023-03-17 11:44:04 +03:00
e5f733c771
fix Bug 61076
2023-03-10 11:39:54 +03:00
245465dce8
authentication: added api descriptions
2023-02-28 16:35:06 +03:00
a1daacb4d0
fix
2022-12-21 12:38:47 +03:00
6e45bc5aa8
removed unused variables
2022-12-09 16:34:00 +03:00
ccfc8d0e47
Auth: added confirm data
2022-12-08 17:53:39 +03:00
d39666df9d
fix
2022-11-16 18:27:07 +03:00
ef7215fbe3
fix
2022-10-27 14:06:37 +03:00
92ef73eb86
async UpdateUserInfo and SaveUserInfo
2022-10-25 18:27:56 +03:00
42c12ca706
Added AllowSuspendedFilter
2022-10-12 12:29:08 +03:00
4dbf1e70b7
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
397af4e55d
refactoring
2022-10-10 14:32:48 +03:00
a563bbe3cf
Merge branch 'develop' into feature/two-factor-authentication
...
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
2022-10-09 21:32:14 +03:00
75aebdd9b2
optimization
2022-10-09 19:35:59 +03:00
fe2dd3c394
Merge branch 'develop' into feature/login-settings
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-10-07 17:47:24 +03:00
Vashchuk Nikita
4b1c7644af
added functionality for flexible tfa configuration
2022-10-04 13:40:21 +04:00
7f1d946269
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
Vashchuk Nikita
94fb1cb5a5
fix multithreading, clustering
2022-09-15 18:55:51 +04:00
f16da6e3ad
refactor
2022-09-09 17:31:56 +03:00
Vashchuk Nikita
57726421f2
Merge branch 'develop' into feature/login-settings
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2022-09-06 12:17:10 +04:00
Vashchuk Nikita
6fbc6c8b78
fix
2022-09-02 15:13:10 +04:00
daa9645259
Api: methods without payment
2022-08-30 19:19:15 +03:00
4dcd9be041
fix: removed IOptionsSnapshot
2022-08-25 13:29:08 +03:00
Vashchuk Nikita
ca87e9fd9c
small fix
2022-08-25 12:38:11 +04:00
Vashchuk Nikita
ccca35ca4a
added loginSettings to protect against brute-force
2022-08-24 19:11:44 +04:00
35ab5a3531
fix order
2022-06-29 19:43:29 +03:00
35bebe49f9
moved from ddf515b8
2022-06-14 11:11:41 +03:00
c1d152becc
moved from ddf515b8
2022-06-07 21:00:08 +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
cb2580dd50
refactoring
2022-04-15 12:08:06 +03:00
62fbab1185
Merge branch 'feature/backend-refactor' into feature/warnings
2022-03-22 13:20:43 +03:00
80eb1c8257
IDE0011
2022-03-17 18:01:39 +03:00
65db98f65c
added new license headers
2022-03-15 21:00:53 +03:00
82daaf4029
rename model to inDto
2022-03-15 13:56:22 +03:00
82aac7c696
rename dtos
2022-03-15 13:00:41 +03:00
e18d6b8757
refactoring: asc.web.api
2022-03-01 13:58:02 +03:00
c3742208cc
replace controllers
2022-03-01 13:03:25 +03:00
