Merge d558d46 into 24f05d8

voiceip · Feb 15, 2023 · 64b62f2 · 64b62f2
2 parents 24f05d8 + d558d46
commit 64b62f2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -37,7 +37,7 @@ jobs:
       continue-on-error: true
     - name: Set vars
       id: vars
-      run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
     - name: Build and Push tinyphone_base  to registry
       if: contains(steps.changed_files.outputs.modified, 'Dockerfile.base')
       run: |

diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj
@@ -628,7 +628,7 @@
 					/usr/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 36.0.0.82;
+				MARKETING_VERSION = 36.0.0.83;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DBOOST_SYSTEM_DYN_LINK",
@@ -678,7 +678,7 @@
 					/usr/local/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 36.0.0.82;
+				MARKETING_VERSION = 36.0.0.83;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DBOOST_SYSTEM_DYN_LINK",

diff --git a/tinyphone/server.h b/tinyphone/server.h
@@ -69,6 +69,7 @@ struct TinyPhoneMiddleware
 			res.add_header("Access-Control-Allow-Origin", "*");
 			res.add_header("Access-Control-Allow-Methods", "OPTIONS, GET, HEAD, POST, PUT, DELETE");
 			res.add_header("Access-Control-Request-Headers", "Content-Type");
+			res.add_header("Access-Control-Allow-Headers", "Content-Type");
 			res.end();
 		}
 	}

diff --git a/tinyphone/stampver.inf b/tinyphone/stampver.inf
@@ -1,5 +1,5 @@
 ;StampVer information file
-FileVersion=36.0.0.82
-ProductVersion=36.0.0.82
+FileVersion=36.0.0.83
+ProductVersion=36.0.0.83
 FileFormat=%a.%b.%c
 ProductFormat=%a.%b.%c