Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
path = wire-server
url = https://github.com/wireapp/wire-server.git
branch = develop

[submodule "wire-apps-jvm-sdk"]
path = wire-apps-jvm-sdk
url = https://github.com/wireapp/wire-apps-jvm-sdk.git
branch = main
4 changes: 3 additions & 1 deletion build/build_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ git checkout ${CURRENT_TAG}

# pull the submodule
git submodule update --init --depth 1 wire-server

git submodule update --init --depth 1 wire-apps-jvm-sdk

# Check if tag exists in mike
if [ -n "${existing_tags[$CURRENT_TAG]}" ]; then
existing_commit="${existing_tags[$CURRENT_TAG]}"
Expand All @@ -91,6 +92,7 @@ else

# deinit the submodule to avoid issues with the next iteration
git submodule deinit -f wire-server
git submodule deinit -f wire-apps-jvm-sdk

# Set the default tag and create an alias to $CURRENT_TAG
$mike set-default $CURRENT_TAG
2 changes: 1 addition & 1 deletion build/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ else
fi

echo "Syncing all the other files changes from ${ORIGINAL_DIR}/ to ${TEMP_DIR}, to work on uncommited changes, if any"
rsync -a --exclude='/.git' --exclude="/wire-server" --exclude='wire-docs*.tar.gz' --exclude=".tmpdir" "${ORIGINAL_DIR}/" "$TEMP_DIR/"
rsync -a --exclude='/.git' --exclude="/wire-server" --exclude="/wire-apps-jvm-sdk" --exclude='wire-docs*.tar.gz' --exclude=".tmpdir" "${ORIGINAL_DIR}/" "$TEMP_DIR/"
4 changes: 4 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ nav:
- Connection: developer/reference/user/connection.md
- User Registration: developer/reference/user/registration.md
- User Rich info: developer/reference/user/rich-info.md
- Apps SDK:
- Understanding Apps: integrations/README.md
- Creating An App: integrations/creating-an-app.md
- Permissions: integrations/permissions.md
- Security Responses:
- Overview: security-responses/README.md
- "2023-01-19 - Security Advisory: HTML Injection in wire.com": security-responses/2023-01-19_html_injection.md
Expand Down
1 change: 1 addition & 0 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Release notes of `wire-server` can be found [here](https://github.com/wireapp/wi
* [Administration](how-to/administrate/README.md)
* [Reference](understand/README.md)
* [Developers Notes](developer/README.md)
* [Apps SDK](integrations/README.md)
* [Security responses](security-responses/README.md)
* [Release Notes](changelog/README.md)

Expand Down
1 change: 1 addition & 0 deletions src/integrations/README.md
1 change: 1 addition & 0 deletions src/integrations/creating-an-app.md
1 change: 1 addition & 0 deletions src/integrations/images/create-app.png
1 change: 1 addition & 0 deletions src/integrations/permissions.md
1 change: 1 addition & 0 deletions wire-apps-jvm-sdk
Submodule wire-apps-jvm-sdk added at 9def62