Commit 8597efcb authored by Davide De Rosa's avatar Davide De Rosa
Browse files

Merge branch 'develop' into 'master'

QA: 2.6.1 Beta 1

See merge request ios/vpn-ios!261
parents 1d9c9543 ea8f9458
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>2.6</string>
<string>2.6.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>
......
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>2.6</string>
<string>2.6.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.6</string>
<string>2.6.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSpokenName</key>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.6</string>
<string>2.6.1</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.6</string>
<string>2.6.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -68,8 +68,8 @@ end
def tunnel_pods
#tunnel_by_path('..')
#tunnel_by_git('216ef12')
tunnel_by_version('1.1.0')
tunnel_by_git('1c458db')
#tunnel_by_version('1.1.0')
end
# Targets
......
......@@ -29,13 +29,13 @@ PODS:
- PIALibrary/VPN (1.1.0):
- PIALibrary/Library
- PIATunnel (~> 1.1)
- PIATunnel (1.1.0):
- PIATunnel/AppExtension (= 1.1.0)
- PIATunnel/Core (= 1.1.0)
- PIATunnel/AppExtension (1.1.0):
- PIATunnel (1.1.1):
- PIATunnel/AppExtension (= 1.1.1)
- PIATunnel/Core (= 1.1.1)
- PIATunnel/AppExtension (1.1.1):
- PIATunnel/Core
- SwiftyBeaver
- PIATunnel/Core (1.1.0):
- PIATunnel/Core (1.1.1):
- OpenSSL-Apple (~> 1.1.0h)
- SBObjectiveCWrapper
- SwiftyBeaver
......@@ -56,7 +56,7 @@ DEPENDENCIES:
- PIALibrary/Mock (~> 1.1.0)
- PIALibrary/UI (~> 1.1.0)
- PIALibrary/VPN (~> 1.1.0)
- PIATunnel (~> 1.1.0)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `1c458db`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -71,13 +71,22 @@ SPEC REPOS:
- MBProgressHUD
- OpenSSL-Apple
- PIALibrary
- PIATunnel
- ReachabilitySwift
- SBObjectiveCWrapper
- SideMenu
- SwiftyBeaver
- TPKeyboardAvoiding
EXTERNAL SOURCES:
PIATunnel:
:commit: 1c458db
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
PIATunnel:
:commit: 1c458db
:git: https://github.com/pia-foss/tunnel-apple
SPEC CHECKSUMS:
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
AlamofireImage: 3b35b586853abaf94ca1250f4e94cff3c21a4c0d
......@@ -88,13 +97,13 @@ SPEC CHECKSUMS:
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
PIALibrary: b3f713941ab9a4cffc197eb460d014fd61a4d1b6
PIATunnel: b88e689038402f01f0514e53e29829d6d76995ac
PIATunnel: bba311b4d274c66d3a5c4a0ed6285f8a7b55e781
ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
SBObjectiveCWrapper: 854ea56b37cd0031af2b1d6e12c2f965fc4ff86d
SideMenu: 47dbf9e4d878062d8994aed43f6e4bf6c1fea30b
SwiftyBeaver: 25bd76281f49ca989ec2e3cbde9af89c15bc1432
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: 5507f1cba50869c9fd77017bc7bbbf2523f81afd
PODFILE CHECKSUM: 5763607789c6fe629aa67cbe7cae13835e3ac43d
COCOAPODS: 1.5.2
COCOAPODS: 1.5.3
Critical fix in 9213 and above:
- Fixed a regression in which a connection timeout in OpenVPN would instead result in a successful attempt, thus showing the app erroneously connected to the VPN.
Changelog:
- Added a screen to redeem gift/trial cards.
- Improved automatic server selection.
- Added "Reset settings" feature.
- Improved OpenVPN stability.
- Added missing translations.
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Indløs gave- eller prøvekort inde i appen.
- Forbedret automatisk servervalg.
- Tilføjet valgmuligheden "Nulstil indstillinger".
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Geschenk oder Testkarte direkt innerhalb der App einlösbar.
- Automatische Serverauswahl verbessert.
- Funktion „Einstellungen zurücksetzen“ hinzugefügt.
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Redeem gift or trial cards right inside the app.
- Improved automatic server selection.
- Added "Reset settings" feature.
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Canjea tarjetas de regalo o de prueba desde la aplicación.
- Selección automática del servidor mejorada
- Se agregó la función "Restablecer configuración".
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Échangez vos cartes cadeaux et cartes d'essai directement dans l'application.
- Sélection automatique de serveur améliorée.
- Ajout de la fonctionnalité « Réinitialisation des paramètres ».
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Riscuoti le carte regalo o di prova direttamente all'interno dell'app.
- Miglioramenti alla selezione automatica del server.
- Nuova funzione "Ripristina impostazioni".
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
・アプリ内から直接ギフトまたはトライアルカードに引換え
・自動サーバー選択を向上
・「リセット設定」機能を追加
\ No newline at end of file
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- 앱 안에서 바로 선물 또는 체험 카드 교환.
- 자동 서버 선택 개선.
- '설정 초기화' 기능 추가.
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Wissel cadeaubonnen of proefperiodekaarten in via de app.
- Verbeterde automatische serverselectie.
- Functie voor het resetten van de instellingen toegevoegd.
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
– Løs inn gave- eller prøvekort i appen.
– Forbedret automatisk svarvalg.
– La til «Tilbakestill innstillinger»-funksjonen.
\ No newline at end of file
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
- Resgate cartões de presente ou teste dentro do app.
- Seleção de servidor automática melhorada.
- Adição do recurso "Redefinir configurações".
- Fixed an issue ending up in a stale VPN connection after several network switches.
- Bugfixing.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment