Commit 61977059 authored by Jose Blaya's avatar Jose Blaya
Browse files

Merge branch...

Merge branch '297-piax-selection-of-automatic-server-option-from-region-list-is-broken' into 'release/3.0.0'

Resolve "PIAX. Selection of 'Automatic' server option from Region List is broken"

See merge request ios/vpn-ios!406
parents c70d2d97 14044be1
This diff is collapsed.
...@@ -21,7 +21,11 @@ extension Server: CustomStringConvertible { ...@@ -21,7 +21,11 @@ extension Server: CustomStringConvertible {
} }
return name return name
default: case .connecting:
return L10n.Dashboard.Vpn.connecting
case .disconnecting:
return L10n.Dashboard.Vpn.disconnecting
case .disconnected:
return name return name
} }
} }
......
...@@ -56,7 +56,7 @@ end ...@@ -56,7 +56,7 @@ end
def shared_main_pods def shared_main_pods
pod 'AlamofireImage' pod 'AlamofireImage'
#library_by_path('') #library_by_path('')
library_by_git('3363d2d') library_by_git('85edc27')
#library_by_version('~> 1.1.3') #library_by_version('~> 1.1.3')
end end
......
...@@ -114,10 +114,10 @@ DEPENDENCIES: ...@@ -114,10 +114,10 @@ DEPENDENCIES:
- FXPageControl - FXPageControl
- HockeySDK - HockeySDK
- iRate - iRate
- PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `3363d2d`) - PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `85edc27`)
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `3363d2d`) - PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `85edc27`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `3363d2d`) - PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `85edc27`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `3363d2d`) - PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `85edc27`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `257296c`) - PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `257296c`)
- PopupDialog - PopupDialog
- SideMenu (= 3.1.5) - SideMenu (= 3.1.5)
...@@ -154,7 +154,7 @@ SPEC REPOS: ...@@ -154,7 +154,7 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
PIALibrary: PIALibrary:
:commit: 3363d2d :commit: 85edc27
:git: https://github.com/pia-foss/client-library-apple :git: https://github.com/pia-foss/client-library-apple
PIATunnel: PIATunnel:
:commit: 257296c :commit: 257296c
...@@ -162,7 +162,7 @@ EXTERNAL SOURCES: ...@@ -162,7 +162,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
PIALibrary: PIALibrary:
:commit: 3363d2d :commit: 85edc27
:git: https://github.com/pia-foss/client-library-apple :git: https://github.com/pia-foss/client-library-apple
PIATunnel: PIATunnel:
:commit: 257296c :commit: 257296c
...@@ -198,6 +198,6 @@ SPEC CHECKSUMS: ...@@ -198,6 +198,6 @@ SPEC CHECKSUMS:
SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165 SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4 TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: bb3884657864e55219003c1b9d444e15d93c77c1 PODFILE CHECKSUM: 102f615cc4d115c44baacd7ad469ed8c9e4cbd47
COCOAPODS: 1.5.3 COCOAPODS: 1.5.3
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