Drew McCormack e0a98a6a9e Merge branch 'master' into baselining ...

Conflicts:
	Framework/Source/Events/CDEEventIntegrator.h
	Framework/Source/Events/CDEEventIntegrator.m
	Framework/Source/General/CDEDefines.h

2014-01-29 14:50:00 +01:00

..

CDEAsynchronousTaskQueue.h

Implemented proper cancellation of merging, using the new operation queue.

2014-01-03 16:47:41 +01:00

CDEAsynchronousTaskQueue.m

Added code to CDEAsynchronousTaskQueue to shuttle execution back to the main thread should it end up on a different thread.

2014-01-14 15:00:23 +01:00

CDEAvailabilityMacros.h

Added CDEAvailabilityMacros to define __IPHONE_7_0 and __MAC_10_9 when compiling against an older SDK and used it in CDEIcloudFileSystem

2014-01-18 16:00:23 -05:00

CDEDefines.h

Merge branch 'master' into baselining

2014-01-29 14:50:00 +01:00

CDEDefines.m

Changed CDELog to a macro, and included method name, class and line.

2014-01-28 15:42:41 +01:00

CDEFoundationAdditions.h

Added CDECloudManager methods for taking snapshots of cloud files, and removing outdated files.

2014-01-21 15:35:22 +01:00

CDEFoundationAdditions.m

Added CDECloudManager methods for taking snapshots of cloud files, and removing outdated files.

2014-01-21 15:35:22 +01:00

CoreDataEnsembles.h

First commit.

2013-09-29 17:56:51 +02:00

NSManagedObjectModel+CDEAdditions.h

Added CDERebaser class, and mapped out the methods.

2014-01-05 15:25:02 +01:00

NSManagedObjectModel+CDEAdditions.m

Added CDERebaser class, and mapped out the methods.

2014-01-05 15:25:02 +01:00

NSMapTable+CDEAdditions.h

Fixed a bug in ordered relationship sync. The global identifiers of objects already existing in an ordered relationship were not being retrieved, so they were not available in the object-global id map. This caused the global id not to be found for some objects when sorting the relationship, and different orders could result on different devices.

2013-10-26 21:41:53 +02:00

NSMapTable+CDEAdditions.m

Fixed a bug in ordered relationship sync. The global identifiers of objects already existing in an ordered relationship were not being retrieved, so they were not available in the object-global id map. This caused the global id not to be found for some objects when sorting the relationship, and different orders could result on different devices.

2013-10-26 21:41:53 +02:00