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

Predicates #771

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Predicates #771

wants to merge 15 commits into from

Commits on Jul 29, 2016

  1. Re-designed predicates. 

    In objective C, instead of ORKResultPredicate we have an extension to NSPredicate with a number of initialisers.

In Swift, we have a much simpler API built using Swift with generic functions, giving a much cleaner syntax.
    @md0u80c9
    md0u80c9 committed Jul 29, 2016
    Copy the full SHA
    dce4572 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ResearchKit/master' into Predicates 

    # Conflicts:
#	ResearchKit/Common/ORKResultPredicate.h
#	ResearchKit/Common/ORKResultPredicate.m
#	Testing/ORKTest/ORKTest/MainViewController.m
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
#	samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
    @md0u80c9
    md0u80c9 committed Jul 29, 2016
    Copy the full SHA
    b502f57 View commit details
    Browse the repository at this point in the history

  3. Fix conflicts

    @md0u80c9
    md0u80c9 committed Jul 29, 2016
    Copy the full SHA
    2022101 View commit details
    Browse the repository at this point in the history

  4. Conflict changes with merge

    @md0u80c9
    md0u80c9 committed Jul 29, 2016
    Copy the full SHA
    cc57958 View commit details
    Browse the repository at this point in the history

  5. Merge fixes

    @md0u80c9
    md0u80c9 committed Jul 29, 2016
    Copy the full SHA
    8a579af View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into Predicates

    @md0u80c9
    md0u80c9 committed Jul 29, 2016
    Copy the full SHA
    ffc6bd2 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2016

  1. Update ORKJSONSerializationTests.m 

    Merge fix to ORKJSONSerializationTests.
    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    43ca560 View commit details
    Browse the repository at this point in the history

  2. Add end of line carriage return 

    Add end of line carriage return
    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    f28327b View commit details
    Browse the repository at this point in the history

  3. Add end of line carriage return 

    Add end of line carriage return
    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    542cf5b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ResearchKit/master' into Predicates 

    # Conflicts:
#	Testing/ORKTest/ORKTest/TaskFactory.swift
#	samples/ORKCatalog/ORKCatalog/Tasks/TaskListRow.swift
    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    8ddb87c View commit details
    Browse the repository at this point in the history

  5. Fix merge conflicts

    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    cc6da86 View commit details
    Browse the repository at this point in the history

  6. Updated predicates to cover the consent predicate, and complete merge… 

    … from master.

Remove NSDate extensions used to make NSDate Comparable and Equatable (it should be comparable and Equatable 'out of the box' now in Swift 3).
ORKSample and ORKTest fixes to ensure more recent changes to both from master branch are compatible with the new API.
    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    2add941 View commit details
    Browse the repository at this point in the history

  7. Move the where statement on the generic function (think this is warne… 

    …d against in Swift 3 as to be deprecated in future).
    @md0u80c9
    md0u80c9 committed Oct 17, 2016
    Copy the full SHA
    683eba5 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Updated API in Tests for new Predicate syntax.

    @md0u80c9
    md0u80c9 committed Nov 14, 2016
    Copy the full SHA
    c875e50 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Merge branch 'master' into Predicates

    @md0u80c9
    md0u80c9 committed Mar 14, 2017
    Copy the full SHA
    cb4988a View commit details
    Browse the repository at this point in the history