GitLab

Merge branch '222-piax-region-selection-update-cell-style' into '221-piax-revamp-region-selection-view'

Resolve "PIAX. Region Selection. Update cell style"

See merge request ios/vpn-ios!340

Merge branch '223-piax-region-selection-add-search-bar' into '222-piax-region-selection-update-cell-style'

Resolve "PIAX. Region Selection. Add search bar"

See merge request ios/vpn-ios!341

Merge branch '224-piax-region-selection-no-results-view' into '223-piax-region-selection-add-search-bar'

Resolve "PIAX. Region Selection. No results view"

See merge request ios/vpn-ios!342

Merge branch '225-piax-region-selection-favorite-server' into '224-piax-region-selection-no-results-view'

Resolve "PIAX. Region Selection. Favorite server."

See merge request ios/vpn-ios!343

Merge branch '226-piax-region-selection-add-filters' into '225-piax-region-selection-favorite-server'

Resolve "PIAX. Region Selection. Add filters"

See merge request ios/vpn-ios!344

Resolve "PIAX. Show error banner when Internet is unreachable"

See merge request ios/vpn-ios!337

Merge branch '220-piax-update-optionsviewcontroller' into '219-piax-show-error-banner-when-internet-is-unreachable'

Resolve "PIAX. Update OptionsViewController"

See merge request ios/vpn-ios!338

Update OptionsViewController to PIAX

Resolve "PIAX. Fix flow for Purchase plan from expiring account"

See merge request ios/vpn-ios!332

Merge branch '214-piax-update-touch-event-colors' into '213-piax-fix-flow-for-purchase-plan-from-expiring-account'

Resolve "PIAX. Update touch event colors"

See merge request ios/vpn-ios!333

# Conflicts:
#	Podfile

Resolve "Update localisation files"

See merge request ios/vpn-ios!331

Resolve "Error message when updating account email"

See merge request ios/vpn-ios!330

Resolve "PIAX. About view"

See merge request ios/vpn-ios!327

Resolve "PIAX. Account view"

See merge request ios/vpn-ios!328

- Fix small UI issues

# Conflicts:
#	PIA VPN AdBlocker/Info.plist
#	PIA VPN Tunnel/Info.plist
#	PIA VPN.xcodeproj/project.pbxproj
#	PIA VPN/Info.plist
#	PIA VPN/en.lproj/Main.storyboard
#	PIA VPNTests/Info.plist
#	PIA VPNUITests/Info.plist
#	Podfile
#	Podfile.lock
#	ci/QA.discussion

Resolve "PIAX. Fix minor issues"

See merge request ios/vpn-ios!322

Resolve "PIAX. Side bar menu"

See merge request ios/vpn-ios!323

Resolve "PIAX. Settings"

See merge request ios/vpn-ios!324

Resolve "PIAX. Prepare Dashboard for tiles"

See merge request ios/vpn-ios!325

Resolve "Fix Update feature from Account view"

See merge request ios/vpn-ios!326

- Cancel action in alertview