Skip to content

Commit 07ce802

Browse files
committed
Merge branch 'development' into lint-docs
2 parents 4e84940 + 1fded46 commit 07ce802

File tree

221 files changed

+6325
-1659
lines changed

Some content is hidden

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

221 files changed

+6325
-1659
lines changed

.travis.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,29 @@ install:
6060
- mkdir public # This because <Maybe> the process of syncing to public is probably deadlocked behind waiting for the public folder to be made, and is never signalled that the folder is created, which ends up stalling the build on Travis CI.
6161
# ------------------------
6262
- ./node_modules/.bin/hugo config --environment $TRAVIS_BRANCH # report the config we are using
63-
- echo "HUGO was run for environment $TRAVIS_BRANCH" > $TRAVIS_BUILD_DIR/hugo.log
63+
# Output header in bold white on green
64+
- printf '\033[37;42;1m' > $TRAVIS_BUILD_DIR/hugo.log
65+
- echo "HUGO was run for environment $TRAVIS_BRANCH" >> $TRAVIS_BUILD_DIR/hugo.log
66+
- printf '\033[0;22m' >> $TRAVIS_BUILD_DIR/hugo.log
6467
# Set pipefail so that if Hugo fails the whole job fails
6568
- set -o pipefail
6669
# put the flags in different config files controlled by environment matching $TRAVIS_BRANCH
6770
# Append output to hugo.log file to print at the end of the travis job
6871
# (see https://stackoverflow.com/questions/418896/how-to-redirect-output-to-a-file-and-stdout)
72+
6973
- ./node_modules/.bin/hugo --environment $TRAVIS_BRANCH 2>&1 | tee -a $TRAVIS_BUILD_DIR/hugo.log
70-
#
74+
7175
# normal htmltest takes too much memory - using a modified version which strips <aside> tag content
7276
# NB - Set pipefail so that Travis CI sees the return code from `tee` and not from `htmltest` so it will always build.
7377
- set +o pipefail
78+
# Additional info in bold white on green
79+
- printf '\033[37;42;1m' >> $TRAVIS_BUILD_DIR/hugo.log
7480
- echo "Any errors from HTMLTEST will be treated as warnings - the build will continue." >> $TRAVIS_BUILD_DIR/hugo.log
81+
- printf '\033[0;22m' >> $TRAVIS_BUILD_DIR/hugo.log
7582
- chmod +x ./htmltest/htmltest
76-
- ./htmltest/htmltest 2>&1 | tee -a $TRAVIS_BUILD_DIR/hugo.log
83+
# Run htmltest - convert red (91) and green (92) aixterm colors with 8-bit versions (31 and 32).
84+
85+
- ./htmltest/htmltest 2>&1 | sed "s/\o033\[91/\o033\[31/g; s/\o033\[92/\o033\[32/g" |tee -a $TRAVIS_BUILD_DIR/hugo.log
7786

7887
before_script:
7988
##############
@@ -109,7 +118,7 @@ script:
109118
# - pwd
110119
# NB: Have to have something here, otherwise Travis tries to run "npm test"
111120
# Display the output from hugo and htmltest so it is not folded and hidden, and is at the end of the log.
112-
- echo "$(<$TRAVIS_BUILD_DIR/hugo.log)"
121+
- printf '\n\n%s\n\n' "$(<$TRAVIS_BUILD_DIR/hugo.log)"
113122

114123
# before_cache
115124
############## Skipped

content/en/docs/apidocs-mxsdk/apidocs/apps/app-repository-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Returns information about the version control repository for a Mendix app.
107107

108108
|Name|Type|Required|Description|
109109
|---|---|---|---|
110-
|`AppId`|String|Yes|The App ID of the Mendix app for which the repository information should be returned. You can find this in the [General](/developerportal/collaborate/general-settings/) tab of the **Settings** page after you open your app in [Apps](https://sprintr.home.mendix.com/). |
110+
|`AppId`|String|Yes|The App ID of the Mendix app for which the repository information should be returned. You can find this under **Project ID** in the [General](/developerportal/collaborate/general-settings/) tab of the **Settings** page after you open your app in [Apps](https://sprintr.home.mendix.com/). |
111111

112112
##### Example
113113

content/en/docs/apidocs-mxsdk/apidocs/apps/team-server-api.md

Lines changed: 0 additions & 230 deletions
This file was deleted.

content/en/docs/apidocs-mxsdk/apidocs/catalog.md

Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
title: "Catalog APIs"
3+
linktitle: "Catalog"
4+
url: /apidocs-mxsdk/apidocs/catalog-apis/
5+
description: "The Catalog APIs register data sources from other business applications."
6+
weight: 50
7+
restapi: true
8+
aliases:
9+
- /apidocs-mxsdk/apidocs/data-hub-apis/
10+
---
11+
12+
## APIs for the Catalog
13+
14+
Mendix offers the following APIs for the [Catalog](/catalog/):
15+
16+
* [Search API](/apidocs-mxsdk/apidocs/search-api/)
17+
18+
Search and retrieve information on registered assets that can be used in your app development.
19+
20+
* [Registration API](/apidocs-mxsdk/apidocs/registration-api/)
21+
22+
Register and update services to the organization's Catalog.
23+
24+
* [Transform API](/apidocs-mxsdk/apidocs/registration-api/#transform-api)
25+
26+
For users deploying their Mendix applications outside Mendix Cloud, generate the request bodies to register services using the Registration API. The v5 compatibility for the Transform API is accessible via the Registration API in the Endpoints section.

0 commit comments

Comments
 (0)