diff --git a/CHANGELOG.md b/CHANGELOG.md index 36d0aec7..14e14396 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Added + +- TorGuard provider (Jorrit Visser). [api-source#5](https://github.com/passepartoutvpn/api-source/issues/5) + ## 1.11.2 (2020-05-12) ### Changed diff --git a/Passepartout-iOS/Global/SwiftGen+Assets.swift b/Passepartout-iOS/Global/SwiftGen+Assets.swift index 5f14a848..ff3155d8 100644 --- a/Passepartout-iOS/Global/SwiftGen+Assets.swift +++ b/Passepartout-iOS/Global/SwiftGen+Assets.swift @@ -281,11 +281,13 @@ internal enum Asset { internal static let zw = ImageAsset(name: "zw") } internal enum Providers { + internal static let hideme = ImageAsset(name: "hideme") internal static let mullvad = ImageAsset(name: "mullvad") internal static let nordvpn = ImageAsset(name: "nordvpn") internal static let pia = ImageAsset(name: "pia") internal static let placeholder = ImageAsset(name: "placeholder") internal static let protonvpn = ImageAsset(name: "protonvpn") + internal static let torguard = ImageAsset(name: "torguard") internal static let tunnelbear = ImageAsset(name: "tunnelbear") internal static let vyprvpn = ImageAsset(name: "vyprvpn") internal static let windscribe = ImageAsset(name: "windscribe") diff --git a/Passepartout-iOS/Global/SwiftGen+Strings.swift b/Passepartout-iOS/Global/SwiftGen+Strings.swift index 77b48324..abd61913 100644 --- a/Passepartout-iOS/Global/SwiftGen+Strings.swift +++ b/Passepartout-iOS/Global/SwiftGen+Strings.swift @@ -299,6 +299,10 @@ internal enum L10n { internal static func protonvpn(_ p1: String) -> String { return L10n.tr("Core", "account.sections.guidance.footer.infrastructure.protonvpn", p1) } + /// Use your %@ service credentials, which may differ from website credentials. + internal static func torguard(_ p1: String) -> String { + return L10n.tr("Core", "account.sections.guidance.footer.infrastructure.torguard", p1) + } /// Use your %@ website credentials. Your username is usually your e-mail. internal static func tunnelbear(_ p1: String) -> String { return L10n.tr("Core", "account.sections.guidance.footer.infrastructure.tunnelbear", p1) diff --git a/Passepartout-iOS/Providers.xcassets/torguard.imageset/Contents.json b/Passepartout-iOS/Providers.xcassets/torguard.imageset/Contents.json new file mode 100644 index 00000000..69d95d66 --- /dev/null +++ b/Passepartout-iOS/Providers.xcassets/torguard.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "torguard@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "torguard@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Passepartout-iOS/Providers.xcassets/torguard.imageset/torguard@2x.png b/Passepartout-iOS/Providers.xcassets/torguard.imageset/torguard@2x.png new file mode 100644 index 00000000..32710a2d Binary files /dev/null and b/Passepartout-iOS/Providers.xcassets/torguard.imageset/torguard@2x.png differ diff --git a/Passepartout-iOS/Providers.xcassets/torguard.imageset/torguard@3x.png b/Passepartout-iOS/Providers.xcassets/torguard.imageset/torguard@3x.png new file mode 100644 index 00000000..de3a90da Binary files /dev/null and b/Passepartout-iOS/Providers.xcassets/torguard.imageset/torguard@3x.png differ diff --git a/README.md b/README.md index ff778c02..1d8648aa 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ Passepartout can connect to a few well-known VPN providers with an existing acco - [NordVPN][app-net-nordvpn] - [Private Internet Access][app-net-pia] - [ProtonVPN][app-net-protonvpn] +- [TorGuard][app-net-torguard] - [TunnelBear][app-net-tunnelbear] - [VyprVPN][app-net-vyprvpn] - [Windscribe][app-net-windscribe] @@ -182,6 +183,7 @@ Website: [passepartoutvpn.app][about-website] [app-net-nordvpn]: https://go.nordvpn.net/SH21Z [app-net-pia]: https://www.privateinternetaccess.com/pages/buy-vpn/ [app-net-protonvpn]: https://proton.go2cloud.org/SHZ +[app-net-torguard]: https://torguard.net/ [app-net-tunnelbear]: https://www.tunnelbear.com/ [app-net-vyprvpn]: https://www.vyprvpn.com/ [app-net-windscribe]: https://secure.link/kCsD0prd diff --git a/Submodules/API b/Submodules/API index 25245fe6..12ea3dcd 160000 --- a/Submodules/API +++ b/Submodules/API @@ -1 +1 @@ -Subproject commit 25245fe6def6ee51936814a7f3ecc6daabf96c87 +Subproject commit 12ea3dcda0da0ef823474bfe748e0f450ad915db diff --git a/Submodules/Core b/Submodules/Core index c9662caa..811bedf3 160000 --- a/Submodules/Core +++ b/Submodules/Core @@ -1 +1 @@ -Subproject commit c9662caa172e1406352c68b931ca3bb2cc5011a3 +Subproject commit 811bedf3ec152b99e7c92398a7b19445a4ada249 diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt index e230209e..4e1b821d 100644 --- a/fastlane/metadata/de-DE/description.txt +++ b/fastlane/metadata/de-DE/description.txt @@ -15,6 +15,7 @@ Passepartout bietet Voreinstellungen für alle gängigen VPN-Anbieter: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/el/description.txt b/fastlane/metadata/el/description.txt index c3e49e69..2533c414 100644 --- a/fastlane/metadata/el/description.txt +++ b/fastlane/metadata/el/description.txt @@ -15,6 +15,7 @@ To Passepartout βασίζετε σε ανοιχτό κώδικα: https://githu - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt index e4152aff..ba6c6aea 100644 --- a/fastlane/metadata/en-US/description.txt +++ b/fastlane/metadata/en-US/description.txt @@ -15,6 +15,7 @@ Passepartout offers presets for major VPN providers: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/es-MX/description.txt b/fastlane/metadata/es-MX/description.txt index bf60dcf7..a1e76a50 100644 --- a/fastlane/metadata/es-MX/description.txt +++ b/fastlane/metadata/es-MX/description.txt @@ -15,6 +15,7 @@ Passepartout ofrece ajustes para estos proveedores VPN: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/fr-FR/description.txt b/fastlane/metadata/fr-FR/description.txt old mode 100755 new mode 100644 index 8998384f..1a8b992a --- a/fastlane/metadata/fr-FR/description.txt +++ b/fastlane/metadata/fr-FR/description.txt @@ -15,6 +15,7 @@ Passepartout offre des réglages pré-conçu avec des fournisseurs VPN majeurs : - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/it/description.txt b/fastlane/metadata/it/description.txt index 7ecc10f5..43bec5ad 100644 --- a/fastlane/metadata/it/description.txt +++ b/fastlane/metadata/it/description.txt @@ -15,6 +15,7 @@ Passepartout offre profili per i maggiori provider VPN: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/nl-NL/description.txt b/fastlane/metadata/nl-NL/description.txt index fec5223e..43881a8b 100644 --- a/fastlane/metadata/nl-NL/description.txt +++ b/fastlane/metadata/nl-NL/description.txt @@ -15,6 +15,7 @@ Passepartout biedt presets voor grote VPN-providers: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/pl/description.txt b/fastlane/metadata/pl/description.txt index f2fcd75c..df030642 100644 --- a/fastlane/metadata/pl/description.txt +++ b/fastlane/metadata/pl/description.txt @@ -15,6 +15,7 @@ Passepartout oferuje gotowe konfiguracje dla poniższych usługodawców: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/pt-BR/description.txt b/fastlane/metadata/pt-BR/description.txt index 138399d6..90968014 100644 --- a/fastlane/metadata/pt-BR/description.txt +++ b/fastlane/metadata/pt-BR/description.txt @@ -15,6 +15,7 @@ Passepartout oferece configurações para os seguintes provedores de VPN: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/ru/description.txt b/fastlane/metadata/ru/description.txt index 7cf47d30..a791fc7d 100644 --- a/fastlane/metadata/ru/description.txt +++ b/fastlane/metadata/ru/description.txt @@ -15,6 +15,7 @@ Passepartout предлагает предустановленные настр - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe diff --git a/fastlane/metadata/sv/description.txt b/fastlane/metadata/sv/description.txt index 28492027..29a3dfd2 100644 --- a/fastlane/metadata/sv/description.txt +++ b/fastlane/metadata/sv/description.txt @@ -15,6 +15,7 @@ Passepartout erbjuder förinställningar för större VPN-leverantörer: - NordVPN - Private Internet Access - ProtonVPN +- TorGuard - TunnelBear - VyprVPN - Windscribe