Skip to content

Commit

Permalink
Merge branch 'develop' into fix/ajax-requests
Browse files Browse the repository at this point in the history
  • Loading branch information
bwbohl authored Feb 2, 2024
2 parents a16e3bc + b313aa6 commit 3411e75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Chekout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get short sha
uses: benjlevesque/short-sha@v2.2
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Upload Artifacts to action run
if: github.repository == 'Edirom/Edirom-Online'
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.3.0
with:
# The name that the artifact will be made available under
name: EdiromOnline_${{ steps.short-sha.outputs.sha }}.zip
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

## xqDoc

We use [xqDoc](https://xqdoc.org) for documenting the XQueries in this repository. Please refer to the section [xqDoc Comments](https://xqdoc.org/xqdoc_comments_doc.html) of the xyDoc-website for details on formatting the documentation comment blocks.
We use [xqDoc](https://xqdoc.org) for documenting the XQueries in this repository. Please refer to the section [xqDoc Comments](https://xqdoc.org/xqdoc_comments_doc.html) of the xqDoc-website for details on formatting the documentation comment blocks.

* XQuery modules must have a library module xqDoc comment preceding the module declaration.
* Function declarations must have a library module xqDoc function comment preceding the function.
Expand Down Expand Up @@ -57,6 +57,7 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th

* Strings: escape with U+00027 APOSTROPHE: `'`


# Javascript

## AJAX calls
Expand Down

0 comments on commit 3411e75

Please sign in to comment.