Commit Graph

32 Commits

Author SHA1 Message Date
629940db44 Merge branch 'hotfix/v1.1.2' into feature/affiliate-link 2023-08-16 19:44:24 +03:00
df20e9e624 api: fix documentation 2023-08-01 11:53:00 +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
c0f3860ee9 Billing: affiliateId to shopping link 2023-06-29 14:16:26 +05:00
cb2d0c3a61 Payments: fixed account url 2023-06-26 17:03:47 +03:00
aa708c8877 added more descriptions and data types 2023-04-25 19:23:54 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
29c37cbba5 fix namespaces for documentation 2023-04-19 16:39:50 +05:00
18b5f9f697 fix documentation 2023-04-18 19:27:48 +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
ed96fe2bdb refresh quota 2023-04-11 18:58:44 +03: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
734fda9329 fixes 2023-03-17 11:44:04 +03:00
e84356411d fix 2023-03-10 18:30:34 +03:00
19971fc908 added the Payment category 2023-03-01 18:27:08 +03:00
c32964e466 payment: added api descriptions 2023-03-01 16:18:05 +03:00
a8bcc8e558 Payment: fix 2023-01-10 20:56:38 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
53e0146a26 Quota: countroom 2022-09-15 17:44:48 +03:00
071f882d53 Payments: customerId = email 2022-09-13 17:29:38 +03:00
87cfb294ab Quota: CountRoomFeature 2022-09-09 10:27:35 +03:00
354c4a69ab Quota: refactoring 2022-09-08 19:57:36 +03:00
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
195d514db8 fix 2022-09-02 12:57:23 +03:00
99011714c8 Api: rename. 2022-09-01 11:27:10 +03:00
daa9645259 Api: methods without payment 2022-08-30 19:19:15 +03:00
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
1c9d3ebfab Api: payment/tariff method 2022-08-30 11:39:43 +03:00
9cfa1cd4b3 Api: payment/currencies 2022-08-26 17:33:55 +03:00
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00