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: GoPlan/cpp-json
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: GoPlan/cpp-json
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ios
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 152 files changed
  • 1 contributor

Commits on Nov 20, 2015

  1. - Re-organising for iOS

    @GoPlan
    GoPlan committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    2952feb View commit details
    Browse the repository at this point in the history

  2. - Re-organising for iOS

    @GoPlan
    GoPlan committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    3a48b2e View commit details
    Browse the repository at this point in the history

  3. - Re-organising for iOS

    @GoPlan
    GoPlan committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    c6f7503 View commit details
    Browse the repository at this point in the history

  4. - Re-organising for iOS

    @GoPlan
    GoPlan committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    fab2aa8 View commit details
    Browse the repository at this point in the history

  5. - Adding son parser to logis-track-ios

    @GoPlan
    GoPlan committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    5221e15 View commit details
    Browse the repository at this point in the history

  6. - CLDEiOSParser

    @GoPlan
    GoPlan committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    a0a6bab View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2015

  1. Re-organising for iOS 

    - Optimised dependencies
    @GoPlan
    GoPlan committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    8d31f06 View commit details
    Browse the repository at this point in the history

  2. Re-organising for iOS 

    - Optimised dependencies
    @GoPlan
    GoPlan committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    822915b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'github/ios' into ios 

    # Conflicts:
#	Test/JsonTestFixture.h
#	cldeparser-ios/cldeparser-ios.xcodeproj/project.pbxproj
#	cldeparser-ios/cldeparser-ios/CLDEiOSParser.mm
#	cldeparser-json/Json.h
#	cldeparser-json/JsonDefaultParser.h
#	cldeparser-json/JsonDerivative.cpp
#	cldeparser-json/JsonEntity.h
#	cldeparser-json/JsonEntityFactory.cpp
#	cldeparser-json/JsonEntityFactory.h
#	cldeparser-json/JsonSyntaxModel.cpp
#	cldeparser-json/JsonSyntaxModel.h
    @GoPlan
    GoPlan committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    6aba530 View commit details
    Browse the repository at this point in the history

  4. - Added Servlet.json test example

    @GoPlan
    GoPlan committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    7ec49d8 View commit details
    Browse the repository at this point in the history

  5. - Added Servlet Json test

    @GoPlan
    GoPlan committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    a5a9330 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2015

  1. Added Reset() method on ParserSingle

    @GoPlan
    GoPlan committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    eed5744 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. Ok

    @GoPlan
    GoPlan committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    4c2cd94 View commit details
    Browse the repository at this point in the history
Loading