Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NT-226] Cancel Backing Integration #884

Merged
merged 15 commits into from
Oct 11, 2019
Merged

[NT-226] Cancel Backing Integration #884

merged 15 commits into from
Oct 11, 2019

Commits on Oct 7, 2019

  1. Adding cancelBacking mutation

    @ifbarrera
    ifbarrera committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    360a98d View commit details
    Browse the repository at this point in the history

  2. Adding mutation to Service.swift

    @ifbarrera
    ifbarrera committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    a716f75 View commit details
    Browse the repository at this point in the history

  3. CancelPledgeViewModel functionality

    @ifbarrera
    ifbarrera committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    7295dbf View commit details
    Browse the repository at this point in the history

  4. Add CancelPledgeViewControllerDelegate and ManagePledgeViewController… 

    …Delegate
    @ifbarrera
    ifbarrera committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    9899daa View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Adding message banner on ProjectPamphlet VC, plus enabling/disabling … 

    …Cancel button on submit
    @ifbarrera
    ifbarrera committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    cf16ddf View commit details
    Browse the repository at this point in the history

  2. Rename cancelButton to cancelPledgeButton

    @ifbarrera
    ifbarrera committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    eb8430b View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. View model tests

    @ifbarrera
    ifbarrera committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    c9db816 View commit details
    Browse the repository at this point in the history

  2. Formatting

    @ifbarrera
    ifbarrera committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    5f71538 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/kickstarter/ios-oss into … 

    …cancel-backing-integration

# Conflicts:
#	Kickstarter-iOS/Views/Controllers/ManagePledgeViewController.swift
#	Library/ViewModels/ManagePledgeViewModelTests.swift
    @ifbarrera
    ifbarrera committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    be2637f View commit details
    Browse the repository at this point in the history

  4. Fixing duplicate protocol conformance

    @ifbarrera
    ifbarrera committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    9397d2d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/kickstarter/ios-oss into … 

    …cancel-backing-integration
    @ifbarrera
    ifbarrera committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    e86b2a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. Merge branch 'master' of https://github.com/kickstarter/ios-oss into … 

    …cancel-backing-integration

# Conflicts:
#	Kickstarter-iOS/Views/Controllers/ManagePledgeViewController.swift
    @ifbarrera
    ifbarrera committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    52fde5b View commit details
    Browse the repository at this point in the history

  2. Fixing incorrect merge

    @ifbarrera
    ifbarrera committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    b83dc60 View commit details
    Browse the repository at this point in the history

  3. Add new input and tests for tapping the view to dismiss the keyboard

    @ifbarrera
    ifbarrera committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    285a270 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into cancel-backing-integration

    @ifbarrera
    ifbarrera committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    c15228c View commit details
    Browse the repository at this point in the history