GitLab

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

- Fixed crash in Dashboard opening the purchase flow

Resolve "PIAX. Update Dashboard UI"

See merge request ios/vpn-ios!319

Resolve "PIAX. Use new spinner for all background tasks"

See merge request ios/vpn-ios!321

- Reload the navigation bar background image when the device has been rotated.