Skip to content

Commit 416a7a8

Browse files
Merge branch 'development' into Maria-delete-mx8
2 parents 9a90b23 + 7423a23 commit 416a7a8

136 files changed

Lines changed: 1477 additions & 173 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/branch-deletion-pr-creation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
116116
- name: Create Deletion PR
117117
if: env.HAS_BRANCHES == 'true'
118-
uses: peter-evans/create-pull-request@v8
118+
uses: peter-evans/create-pull-request@v8 # NOTE: If you upgrade the version of this action, you must also update the GitHub Actions allowlist in mendix/docs > Settings > Actions > General to permit the new version tag, otherwise the workflow will fail.
119119
with:
120120
token: ${{ secrets.GITHUB_TOKEN }}
121121
title: "[Auto] Branch Deletion Candidates - ${{ env.CURRENT_DATE }}"

.github/workflows/lint-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
echo "EOF" >> $GITHUB_ENV
4747
# Creates PR for linted content changes - needs version > 6 for NodeJS 24
4848
- name: Create pull request
49-
uses: peter-evans/create-pull-request@v8
49+
uses: peter-evans/create-pull-request@v8 # NOTE: If you upgrade the version of this action, you must also update the GitHub Actions allowlist in mendix/docs > Settings > Actions > General to permit the new version tag, otherwise the workflow will fail.
5050
with:
5151
commit-message: Run markdownlint-cli2 on docs to find (and correct) linting errors.
5252
title: '[Auto] Lint docs'

.github/workflows/remunusedattachments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
# Creates pull request
3030
- name: Create Pull Request
31-
uses: peter-evans/create-pull-request@v8
31+
uses: peter-evans/create-pull-request@v8 # NOTE: If you upgrade the version of this action, you must also update the GitHub Actions allowlist in mendix/docs > Settings > Actions > General to permit the new version tag, otherwise the workflow will fail.
3232
with:
3333
commit-message: Run removeUnusedAttachments.py on docs
3434
title: '[Auto] Remove unused attachments'

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ install:
6969
# Append output to hugo.log file to print at the end of the travis job
7070
# (see https://stackoverflow.com/questions/418896/how-to-redirect-output-to-a-file-and-stdout)
7171

72-
- travis_wait 15 bash -c './node_modules/.bin/hugo --environment $TRAVIS_BRANCH 2>&1 | tee -a $TRAVIS_BUILD_DIR/hugo.log'
72+
# bash -o pipefail ensures Hugo's non-zero exit code is not masked by tee inside the subprocess
73+
- travis_wait 15 bash -o pipefail -c './node_modules/.bin/hugo --environment $TRAVIS_BRANCH 2>&1 | tee -a $TRAVIS_BUILD_DIR/hugo.log'
7374

7475
# normal htmltest takes too much memory - using a modified version which strips <aside> tag content
7576
# NB - Set pipefail so that Travis CI sees the return code from `tee` and not from `htmltest` so it will always build.

assets/scss/_styles_project.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
display: flex; // Nested flexbox container
2525
}
2626

27+
.alert-text {
28+
flex: 1;
29+
min-width: 0;
30+
}
31+
2732
.alert-svg { // Format alert icons
2833
height:1.3rem;
2934
width:1.3rem;

config/_default/hugo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,23 @@ defaultContentLanguage = "en"
2020
defaultContentLanguageInSubdir = false
2121
# Useful when translating.
2222
enableMissingTranslationPlaceholders = true
23-
languageCode = "en-us"
23+
locale = "en-us"
2424

2525
disableKinds = ["taxonomy", "term"]
2626

2727
# Image processing configuration. (Do we use this - probably not?)
2828
[imaging]
2929
resampleFilter = "CatmullRom"
30-
quality = 75
3130
anchor = "smart"
31+
32+
[imaging.jpeg]
33+
quality = 75
3234

3335
# Language configuration
3436

3537
[languages]
3638
[languages.en]
37-
languageName ="English"
39+
label ="English"
3840
# Weight used for sorting.
3941
weight = 1
4042

config/production/hugo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,11 @@ title = "Mendix Documentation"
1919
mediaType = "application/json" # file output type
2020
notAlternative = true # excludes from looping over .AlternativeOutputFormats page variable
2121

22+
# Hugo 0.161.0 Introduces an error from browserslist-stats.json which is triggered on a production build.
23+
# development build is fine, so probably related to algolia build
24+
# see discussion here: https://discourse.gohugo.io/t/security-error-with-the-new-0-161-0-security-for-postcss/57186
25+
# Add new "allowread" setting
26+
[security]
27+
[security.node]
28+
[security.node.permissions]
29+
allowRead = ['.', '/**/browserslist-stats.json']

content/en/docs/apidocs-mxsdk/apidocs/private-mendix-platform/build-api.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: "Private Mendix Platform Build API"
2+
title: "Private Mendix Platform Build API - Version 1"
3+
linktitle: "Build API"
34
url: /apidocs-mxsdk/apidocs/private-platform-build-api/
45
type: swagger
56
description: "This API allows you to manage packages in Private Mendix Platform."
67
restapi: true
78
weight: 60
8-
linktitle: "Build API"
99
---
1010

1111
{{% alert color="info" %}}
@@ -26,6 +26,4 @@ The Private Mendix Platform Build API allows you to manage app packages in Priva
2626

2727
## API Reference
2828

29-
### Version 1
30-
3129
{{< swaggerui src="/openapi-spec/openapi-build-v1.yaml" >}}

content/en/docs/apidocs-mxsdk/apidocs/private-mendix-platform/deploy-api.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: "Private Mendix Platform Deploy API"
2+
title: "Private Mendix Platform Deploy API - Version 1"
3+
linktitle: "Deploy API"
34
url: /apidocs-mxsdk/apidocs/private-platform-deploy-api/
45
type: swagger
56
description: "This API allows you to create and manage environments in Private Mendix Platform."
67
restapi: true
78
weight: 60
8-
linktitle: "Deploy API"
99
---
1010

1111
{{% alert color="info" %}}
@@ -26,6 +26,4 @@ The Private Mendix Platform Deploy API allows you to manage environments in Priv
2626

2727
## API Reference
2828

29-
### Version 1
30-
3129
{{< swaggerui src="/openapi-spec/openapi-deploy-v1.yaml" >}}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
title: "Private Mendix Platform Group API - Version 2"
3+
linktitle: "Group API - Version 2"
4+
url: /apidocs-mxsdk/apidocs/private-platform-group-api-v2/
5+
type: swagger
6+
description: "This API allows you to manage user groups in Private Mendix Platform."
7+
restapi: true
8+
weight: 60
9+
---
10+
11+
{{% alert color="info" %}}
12+
This document is about [Private Mendix Platform](/private-mendix-platform/) API. This API is only available on instances of Private Mendix Platform. For [Mendix on Kubernetes](/developerportal/deploy/private-cloud/) API, see [Mendix on Kubernetes Build API](/apidocs-mxsdk/apidocs/private-cloud-build-api/) and [Mendix on Kubernetes Deploy API](/apidocs-mxsdk/apidocs/private-cloud-deploy-api/).
13+
{{% /alert %}}
14+
15+
## Introduction
16+
17+
The Private Mendix Platform Group API version 2 allows you to manage user groups in Private Mendix Platform. You can use the API to do the following:
18+
19+
* Get a group by ID.
20+
* Get a list of all groups for the current user.
21+
* Create, update, or delete a group.
22+
* Retrieve a list of all users in a group.
23+
* Update group member roles.
24+
* Add or remove members from a group.
25+
* Retrieve all cluster namespaces assigned to a group.
26+
* Assign a cluster namespace to a group.
27+
* Update the deployment purpose of cluster namespace.
28+
* Remove cluster namespaces from the group.
29+
30+
{{% alert color="info" %}}
31+
For information about Group API version 1, see [Group API - Version 1](/apidocs-mxsdk/apidocs/private-platform-group-api/).
32+
{{% /alert %}}
33+
34+
## API Reference
35+
36+
{{< swaggerui src="/openapi-spec/openapi-group-v2.yaml" >}}

0 commit comments

Comments
 (0)