Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.
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: couchbaselabs/TouchDB-iOS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Adapptor/TouchDB-iOS
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.
  • 12 commits
  • 6 files changed
  • 2 contributors

Commits on Jun 21, 2012

  1. Warnings are not errors

    Michael Ensly committed Jun 21, 2012
    Configuration menu
    Copy the full SHA
    c642351 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2012

  1. Merge https://github.com/couchbaselabs/TouchDB-iOS

    Michael Ensly committed Jul 24, 2012
    Configuration menu
    Copy the full SHA
    667b3b3 View commit details
    Browse the repository at this point in the history

  2. Added framework scheme

    Michael Ensly committed Jul 24, 2012
    Configuration menu
    Copy the full SHA
    5348166 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2012

  1. Merge https://github.com/couchbaselabs/TouchDB-iOS

    Michael Ensly committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    0bf25d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2012

  1. don't add dot to the end of hostnames as it makes apache fail with th… 

    …is error: ostname pockethealth.api.adapptor.com.au. provided via SNI and hostname pockethealth.api.adapptor.com.au provided via HTTP are different
    Daniel Murray committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    0f8d18c View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2012

  1. Merge https://github.com/couchbaselabs/TouchDB-iOS into origin/master 

    Conflicts:
	Source/TDRouter.m
    Michael Ensly committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    403391d View commit details
    Browse the repository at this point in the history

  2. Merge https://github.com/couchbaselabs/TouchDB-iOS 

    Conflicts:
	Source/TDRouter.m
    Michael Ensly committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    6deb859 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'origin/master' 

    Conflicts:
	Source/TDRouter.m
    Michael Ensly committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    141a41e View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2013

  1. Merge git://github.com/couchbaselabs/TouchDB-iOS 

    Conflicts:
	Source/ChangeTracker/TDChangeTracker.m
	vendor/MYUtilities
    Michael Ensly committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    faffd62 View commit details
    Browse the repository at this point in the history

  2. fmdb update?

    Michael Ensly committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    0cc0b45 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2014

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

    Conflicts:
	Source/ChangeTracker/TDChangeTracker.m
	vendor/fmdb
    Daniel Murray committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    3433916 View commit details
    Browse the repository at this point in the history

  2. allow connecting via tlsv1.2

    Daniel Murray committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    c042d9b View commit details
    Browse the repository at this point in the history
Loading