Browse Source

Merge branch 'master' into backup

# Conflicts:
#	src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs
pull/261/head
Sebastian Stehle 8 years ago
parent
commit
0a14bbf54e
  1. 5
      src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs
  2. 2
      src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs
  3. 4
      src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs
  4. 6
      src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs
  5. 2
      src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs
  6. 2
      src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs

5
src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs

@ -93,7 +93,8 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="request">Client object that needs to be updated.</param> /// <param name="request">Client object that needs to be updated.</param>
/// <returns> /// <returns>
/// 204 => Client updated. /// 204 => Client updated.
/// 404 => App not found or client not found. /// 400 => Client request not valid.
/// 404 => Client or app not found.
/// </returns> /// </returns>
/// <remarks> /// <remarks>
/// Only the display name can be changed, create a new client if necessary. /// Only the display name can be changed, create a new client if necessary.
@ -115,7 +116,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="clientId">The id of the client that must be deleted.</param> /// <param name="clientId">The id of the client that must be deleted.</param>
/// <returns> /// <returns>
/// 204 => Client revoked. /// 204 => Client revoked.
/// 404 => App not found or client not found. /// 404 => Client or app not found.
/// </returns> /// </returns>
/// <remarks> /// <remarks>
/// The application that uses this client credentials cannot access the API after it has been revoked. /// The application that uses this client credentials cannot access the API after it has been revoked.

2
src/Squidex/Areas/Api/Controllers/Apps/AppContributorsController.cs

@ -88,7 +88,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <returns> /// <returns>
/// 204 => User removed from app. /// 204 => User removed from app.
/// 400 => User is not assigned to the app. /// 400 => User is not assigned to the app.
/// 404 => App not found. /// 404 => Contributor or app not found.
/// </returns> /// </returns>
[HttpDelete] [HttpDelete]
[Route("apps/{app}/contributors/{id}/")] [Route("apps/{app}/contributors/{id}/")]

4
src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs

@ -71,7 +71,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="request">The language to add to the app.</param> /// <param name="request">The language to add to the app.</param>
/// <returns> /// <returns>
/// 201 => Language created. /// 201 => Language created.
/// 400 => Language is an invalid language. /// 400 => Language request not valid.
/// 404 => App not found. /// 404 => App not found.
/// </returns> /// </returns>
[MustBeAppEditor] [MustBeAppEditor]
@ -97,7 +97,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="request">The language object.</param> /// <param name="request">The language object.</param>
/// <returns> /// <returns>
/// 204 => Language updated. /// 204 => Language updated.
/// 400 => Language object is invalid. /// 400 => Language request not valid.
/// 404 => Language or app not found. /// 404 => Language or app not found.
/// </returns> /// </returns>
[MustBeAppEditor] [MustBeAppEditor]

6
src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs

@ -64,6 +64,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="request">Pattern to be added to the app.</param> /// <param name="request">Pattern to be added to the app.</param>
/// <returns> /// <returns>
/// 201 => Pattern generated. /// 201 => Pattern generated.
/// 400 => Pattern request not valid.
/// 404 => App not found. /// 404 => App not found.
/// </returns> /// </returns>
[HttpPost] [HttpPost]
@ -89,7 +90,8 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="request">Pattern to be updated for the app.</param> /// <param name="request">Pattern to be updated for the app.</param>
/// <returns> /// <returns>
/// 204 => Pattern updated. /// 204 => Pattern updated.
/// 404 => App not found or pattern not found. /// 400 => Pattern request not valid.
/// 404 => Pattern or app not found.
/// </returns> /// </returns>
[HttpPut] [HttpPut]
[Route("apps/{app}/patterns/{id}/")] [Route("apps/{app}/patterns/{id}/")]
@ -111,7 +113,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="id">The id of the pattern to be deleted.</param> /// <param name="id">The id of the pattern to be deleted.</param>
/// <returns> /// <returns>
/// 204 => Pattern removed. /// 204 => Pattern removed.
/// 404 => App or pattern not found. /// 404 => Pattern or app not found.
/// </returns> /// </returns>
/// <remarks> /// <remarks>
/// Schemas using this pattern will still function using the same Regular Expression /// Schemas using this pattern will still function using the same Regular Expression

2
src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs

@ -83,7 +83,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
/// <param name="request">The app object that needs to be added to squidex.</param> /// <param name="request">The app object that needs to be added to squidex.</param>
/// <returns> /// <returns>
/// 201 => App created. /// 201 => App created.
/// 400 => App object is not valid. /// 400 => App request not valid.
/// 409 => App name is already in use. /// 409 => App name is already in use.
/// </returns> /// </returns>
/// <remarks> /// <remarks>

2
src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs

@ -130,8 +130,8 @@ namespace Squidex.Areas.Api.Controllers.Statistics
/// <param name="toDate">The to date.</param> /// <param name="toDate">The to date.</param>
/// <returns> /// <returns>
/// 200 => Storage usage returned. /// 200 => Storage usage returned.
/// 404 => App not found.
/// 400 => Range between from date and to date is not valid or has more than 100 days. /// 400 => Range between from date and to date is not valid or has more than 100 days.
/// 404 => App not found.
/// </returns> /// </returns>
[HttpGet] [HttpGet]
[Route("apps/{app}/usages/storage/{fromDate}/{toDate}/")] [Route("apps/{app}/usages/storage/{fromDate}/{toDate}/")]

Loading…
Cancel
Save