Merge pull request #444 from getodk/next

Release v2023.3.1
getodk · Jul 6, 2023 · 906addf · 906addf
2 parents bdd0a2e + ae79fd8
commit 906addf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/enketo.dockerfile b/enketo.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo-express:6.1.0
+FROM ghcr.io/enketo/enketo-express:6.2.0
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo_express
 WORKDIR ${ENKETO_SRC_DIR}

diff --git a/files/nginx/odk.conf.template b/files/nginx/odk.conf.template
@@ -25,7 +25,7 @@ server {
   gzip_types text/plain text/css application/json application/x-javascript text/xml text/csv;
 
   location /- {
-    proxy_pass http://enketo:8005/-;
+    proxy_pass http://enketo:8005;
     proxy_redirect off;
     proxy_set_header Host $host;
 

diff --git a/server b/server
+38 −25		lib/formats/odata.js
+1 −1		lib/http/endpoint.js
+1 −1		lib/model/query/datasets.js
+155 −133		package-lock.json
+1 −1		package.json
+2 −2		test/assertions.js
+4 −0		test/data/xml.js
+89 −0		test/integration/api/datasets.js
+32 −0		test/integration/api/odata.js
+2 −1		test/integration/api/sessions.js
+4 −3		test/integration/api/submissions.js
+2 −1		test/integration/worker/entity.js
+5 −0		test/unit/formats/odata.js
+13 −13		test/unit/http/endpoint.js