Skip to content

Commit

Permalink
Merge branch 'master' into junyi/modern-linux-routing
Browse files Browse the repository at this point in the history
  • Loading branch information
@jyyi1
jyyi1 authored Dec 3, 2024
2 parents 07c15d2 + b0c3d25 commit 18682bf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions client/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "Outline/Outline-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client;
Expand Down Expand Up @@ -851,7 +851,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "Outline/Outline-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client;
Expand Down Expand Up @@ -1028,7 +1028,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1073,7 +1073,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
Expand Down
2 changes: 1 addition & 1 deletion server_manager/messages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
"share-invite-copied": "Copied invitation to clipboard",
"share-invite-copy": "Copy invitation",
"share-invite-copy-access-key": "Copy access key",
"share-invite-html": "Use this server to safely access the open internet:<br><br>1) Download and install the Outline app for your device:<br><br> - iOS: https://itunes.apple.com/app/outline-app/id1356177741<br> - MacOS: https://itunes.apple.com/app/outline-app/id1356178125<br> - Windows: https://s3.amazonaws.com/outline-releases/client/windows/stable/Outline-Client.exe<br> - Linux: https://s3.amazonaws.com/outline-releases/client/linux/stable/Outline-Client.AppImage<br> - Android: https://play.google.com/store/apps/details?id=org.outline.android.client<br> - Android alternative link: https://s3.amazonaws.com/outline-releases/client/android/stable/Outline-Client.apk<br><br>2) You will receive an access key that starts with ss://. Once your receive it, copy this access key.<br><br>3) Open the Outline client app. If your access key is auto-detected, tap \"Connect\" and proceed. If your access key is not auto-detected, then paste it in the field, then tap \"Connect\" and proceed.<br><br>You're ready to use the open internet! To make sure you successfully connected to the server, try searching for \"what is my ip\" on Google Search. The IP address shown in Google should match the IP address in the Outline client.<br><br>Learn more about Outline here: https://getoutline.org/",
"share-invite-html": "Use this server to safely access the open internet:<br><br>1) Download and install the Outline app for your device:<br><br> - iOS: https://itunes.apple.com/app/outline-app/id1356177741<br> - MacOS: https://itunes.apple.com/app/outline-app/id1356178125<br> - Windows: https://s3.amazonaws.com/outline-releases/client/windows/stable/Outline-Client.exe<br> - Linux: https://s3.amazonaws.com/outline-releases/client/linux/stable/Outline-Client.AppImage<br> - Android: https://play.google.com/store/apps/details?id=org.outline.android.client<br> - Android alternative link: https://s3.amazonaws.com/outline-releases/client/android/stable/Outline-Client.apk<br><br>2) You will receive an access key that starts with ss://. Once you receive it, copy this access key.<br><br>3) Open the Outline client app. If your access key is auto-detected, tap \"Connect\" and proceed. If your access key is not auto-detected, then paste it in the field, then tap \"Connect\" and proceed.<br><br>You're ready to use the open internet! To make sure you successfully connected to the server, try searching for \"what is my ip\" on Google Search. The IP address shown in Google should match the IP address in the Outline client.<br><br>Learn more about Outline here: https://getoutline.org/",
"share-invite-instructions": "Follow our invitation instructions on GitHub:",
"share-invite-trouble": "Having trouble accessing the invitation link?",
"share-title": "Share access",
Expand Down
2 changes: 1 addition & 1 deletion server_manager/messages/master_messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@
}
},
"share_invite_html": {
"message": "Use this server to safely access the open internet:$LINE_BREAK$$LINE_BREAK$1) Download and install the Outline app for your device:$LINE_BREAK$$LINE_BREAK$ - iOS: https://itunes.apple.com/app/outline-app/id1356177741$LINE_BREAK$ - MacOS: https://itunes.apple.com/app/outline-app/id1356178125$LINE_BREAK$ - Windows: https://s3.amazonaws.com/outline-releases/client/windows/stable/Outline-Client.exe$LINE_BREAK$ - Linux: https://s3.amazonaws.com/outline-releases/client/linux/stable/Outline-Client.AppImage$LINE_BREAK$ - Android: https://play.google.com/store/apps/details?id=org.outline.android.client$LINE_BREAK$ - Android alternative link: https://s3.amazonaws.com/outline-releases/client/android/stable/Outline-Client.apk$LINE_BREAK$$LINE_BREAK$2) You will receive an access key that starts with ss://. Once your receive it, copy this access key.$LINE_BREAK$$LINE_BREAK$3) Open the Outline client app. If your access key is auto-detected, tap \"Connect\" and proceed. If your access key is not auto-detected, then paste it in the field, then tap \"Connect\" and proceed.$LINE_BREAK$$LINE_BREAK$You're ready to use the open internet! To make sure you successfully connected to the server, try searching for \"what is my ip\" on Google Search. The IP address shown in Google should match the IP address in the Outline client.$LINE_BREAK$$LINE_BREAK$Learn more about Outline here: https://getoutline.org/",
"message": "Use this server to safely access the open internet:$LINE_BREAK$$LINE_BREAK$1) Download and install the Outline app for your device:$LINE_BREAK$$LINE_BREAK$ - iOS: https://itunes.apple.com/app/outline-app/id1356177741$LINE_BREAK$ - MacOS: https://itunes.apple.com/app/outline-app/id1356178125$LINE_BREAK$ - Windows: https://s3.amazonaws.com/outline-releases/client/windows/stable/Outline-Client.exe$LINE_BREAK$ - Linux: https://s3.amazonaws.com/outline-releases/client/linux/stable/Outline-Client.AppImage$LINE_BREAK$ - Android: https://play.google.com/store/apps/details?id=org.outline.android.client$LINE_BREAK$ - Android alternative link: https://s3.amazonaws.com/outline-releases/client/android/stable/Outline-Client.apk$LINE_BREAK$$LINE_BREAK$2) You will receive an access key that starts with ss://. Once you receive it, copy this access key.$LINE_BREAK$$LINE_BREAK$3) Open the Outline client app. If your access key is auto-detected, tap \"Connect\" and proceed. If your access key is not auto-detected, then paste it in the field, then tap \"Connect\" and proceed.$LINE_BREAK$$LINE_BREAK$You're ready to use the open internet! To make sure you successfully connected to the server, try searching for \"what is my ip\" on Google Search. The IP address shown in Google should match the IP address in the Outline client.$LINE_BREAK$$LINE_BREAK$Learn more about Outline here: https://getoutline.org/",
"description": "This string appears as an email invitation instructing new Outline users how to set up and connect to Outline.",
"placeholders": {
"LINE_BREAK": {
Expand Down

0 comments on commit 18682bf

Please sign in to comment.