Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qiniu/iOS-netdiag
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: joshluongo/iOS-netdiag
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 41 files changed
  • 2 contributors

Commits on Jul 8, 2016

  1. Moved projects. Added Carthage Support but broke cocoa pods and tests. 

    TODO: Port tests to XCTest and Fix cocoa pods.
    @joshluongo
    joshluongo committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    dd94a2a View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2017

  1. Fix some deprecated api for xcode 9

    William Wang authored and William Wang committed Sep 25, 2017
    Configuration menu
    Copy the full SHA
    3393bc0 View commit details
    Browse the repository at this point in the history

  2. Remove .ds_store

    William Wang authored and William Wang committed Sep 25, 2017
    Configuration menu
    Copy the full SHA
    3b6f51b View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. Merge branch 'master' of github.com:qiniu/iOS-netdiag into fix_xcode9

    William Wang authored and William Wang committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    19f9566 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2017

  1. Merge remote-tracking branch 'upstream/master' 

    # Conflicts:
#	NetDiag.xcodeproj/project.pbxproj
    @joshluongo
    joshluongo committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    fd7242d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'showang/fix_xcode9'

    @joshluongo
    joshluongo committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    ba4aaa7 View commit details
    Browse the repository at this point in the history

  3. Cutdown project. Merged changes.

    @joshluongo
    joshluongo committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    935aae0 View commit details
    Browse the repository at this point in the history

  4. Attempt to fix issue with headers.

    @joshluongo
    joshluongo committed Oct 23, 2017
    Configuration menu
    Copy the full SHA
    21cd92d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Update project.pbxproj

    @joshluongo
    joshluongo authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    51018d9 View commit details
    Browse the repository at this point in the history
Loading