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

..

Ensembles iOS.xcodeproj

Added continuity tests for rebasing. Also added some unit tests for various checks that are now modified to take account of baselines.

2014-01-24 12:22:44 +01:00

Ensembles Mac.xcodeproj

Started adding baselining tests. Not all passing at this point.

2014-01-27 14:36:08 +01:00

Extensions

Split Dropbox code off main project. You now need to include it separately if you want to use it.

2013-11-19 20:05:06 +01:00

Resources/CDEEventStoreModel.xcdatamodeld

There is some indication that cloud files can still contain multiple events, which should not happen. Added some extra checks, and made the code to remove any old file more robust. When we export, if an old file was there, any new event could be added to it, which should not happen.

2014-01-17 15:09:44 +01:00

Source

Merge branch 'master' into baselining

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

Tests

Fixed a test to take into account that revisions attached to a baseline now take the global count of the baseline.

2014-01-28 17:34:52 +01:00