Commit Graph

155 Commits

Author SHA1 Message Date
John Rommel Estropia 0c2a3ac4e9 fix merge 2016-05-07 18:13:44 +08:00
John Rommel Estropia a6291e116c Merge branch 'master' into corestore2_develop
# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectContext+Transaction.swift
2016-05-07 17:47:35 +08:00
John Rommel Estropia ae5f737baf WIP: logging clauses 2016-05-07 12:01:31 +08:00
John Rommel Estropia 4eecd80710 WIP: pretty logging 2016-05-06 09:19:24 +08:00
John Rommel Estropia 0073d038e0 WIP: logging utilities 2016-05-05 09:44:14 +08:00
John Rommel Estropia 0bbb4118a1 documentation for iCloud methods 2016-04-30 01:20:35 +09:00
John Rommel Estropia 3fe9e4ee1d WIP: ICloudStore prototype 2016-04-30 00:26:06 +09:00
John Rommel Estropia bd19326447 folder structure 2016-04-03 19:55:10 +09:00
John Rommel Estropia dccc958ef1 comment documentations 2016-04-03 19:47:25 +09:00
John Rommel Estropia ab3095f078 WIP: documentation 2016-04-03 13:37:00 +09:00
John Rommel Estropia aa32f5e158 support value querying in Objective C 2016-04-02 21:39:05 +09:00
John Rommel Estropia b95aaf151d Merge branch 'corestore2_develop' into corestore2_develop_objc 2016-04-01 07:47:03 +09:00
John Rommel Estropia 114bc71841 Merge branch 'develop' into corestore2_develop
# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
2016-04-01 07:46:42 +09:00
John Rommel Estropia 83d0412cb9 Merge branch 'corestore2_develop' into corestore2_develop_objc
# Conflicts:
#	CoreStore.xcodeproj/project.pbxproj
2016-04-01 07:20:42 +09:00
John Rommel Estropia 26e4118355 Merge branch 'develop' into corestore2_develop
# Conflicts:
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	CoreStore/Setting Up/DataStack.swift
#	Sources/Info.plist
2016-04-01 07:18:53 +09:00
John Rommel Estropia 28b7ba01dc prevent deadlock on when DataStack gets deallocated 2016-03-31 00:04:17 +09:00
John Rommel Estropia b529735269 Merge branch 'corestore2_develop' into corestore2_develop_objc
# Conflicts:
#	Sources/Observing/ListMonitor.swift
2016-03-30 21:41:44 +09:00
John Rommel Estropia d23121d8ed Merge branch 'develop' into corestore2_develop
# Conflicts:
#	Sources/Observing/ListMonitor.swift
2016-03-30 21:40:21 +09:00
John Estropia a4d3d0c0ed fix mistype 2016-03-30 13:05:29 +09:00
John Estropia 8b7af86526 WIP: Objective-C bridge (90% done!) 2016-03-30 11:12:17 +09:00
John Rommel Estropia 09d844f5df WIP: CSSetupResult 2016-03-30 01:55:06 +09:00
John Estropia e25e198bf8 WIP: Objective-C migrations 2016-03-29 14:46:31 +09:00
John Estropia e99d19d2ac ListMonitor and ObjectMonitor objective C bridge 2016-03-29 14:15:57 +09:00
John Estropia 9d7960e674 typed arrays 2016-03-28 19:41:11 +09:00
John Estropia e9ac8629a1 tidy up 2016-03-28 19:35:09 +09:00
John Estropia b0b0df2861 allow public access to bridgeToObjectiveC and bridgeToSwift properties 2016-03-28 19:07:35 +09:00
John Estropia eda398d758 WIP: CSListMonitor 2016-03-28 17:19:51 +09:00
John Rommel Estropia d3e0f576cf tidy up 2016-03-27 23:12:21 +09:00
John Rommel Estropia b8ea7ecf01 WIP: objective-C fetching 2016-03-27 23:02:24 +09:00
John Estropia 789028bc58 WIP: CSImportableUniqueObject 2016-03-25 19:59:31 +09:00
John Estropia 1ff635d8b5 WIP: CSImportableObject 2016-03-25 17:57:26 +09:00
John Rommel Estropia 707445a169 WIP: SaveResult bridge 2016-03-25 07:57:09 +09:00
John Estropia 90369cf994 WIP: simpler bridging 2016-03-24 21:22:58 +09:00
John Estropia 09708e587c Merge branch 'corestore2_develop' into corestore2_develop_objc
# Conflicts:
#	CoreStore.xcodeproj/project.pbxproj
2016-03-24 15:16:13 +09:00
John Estropia 36e6e4a8b9 Merge branch 'develop' into corestore2_develop
# Conflicts:
#	Cartfile
#	Cartfile.resolved
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	CoreStore/Migrating/DataStack+Migration.swift
#	CoreStore/Setting Up/DataStack.swift
#	README.md
#	Sources/Info.plist
2016-03-24 15:09:36 +09:00
John Rommel Estropia ed8891a6d5 Merge branch 'corestore2_develop' into corestore2_develop_objc
# Conflicts:
#	Sources/Migrating/MigrationChain.swift
2016-03-23 21:24:30 +09:00
John Rommel Estropia dd6c6abaf0 Merge branch 'develop' into corestore2_develop
# Conflicts:
#	CoreStore.podspec
#	CoreStore/CartFile
#	README.md
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectModel+Setup.swift
#	Sources/Logging/CoreStore+Logging.swift
2016-03-23 21:23:08 +09:00
John Estropia 2c65ac1834 WIP: transactions in ObjC 2016-03-23 11:32:35 +09:00
John Rommel Estropia 24008d62b2 WIP: error handling 2016-03-22 22:51:42 +09:00
John Rommel Estropia e8a9cc9d67 WIP: error handling 2016-03-22 07:23:11 +09:00
John Estropia 1507ac63f9 WIP: objective C storages 2016-03-18 20:32:23 +09:00
John Rommel Estropia f2df8f7171 WIP: objective C interface 2016-03-18 02:39:18 +09:00
John Rommel Estropia 3ddfd3cccc WIP: objc setup 2016-03-17 07:51:22 +09:00
John Estropia 21f57518c8 WIP: Objective-C bridge 2016-03-16 21:23:41 +09:00
John Rommel Estropia d9422f7f2e Changed error-handling method to rely on new enum CoreStoreError instead of NSErrors 2016-03-16 07:56:19 +09:00
John Rommel Estropia 0ce89b8460 WIP: documentation 2016-03-15 07:57:02 +09:00
John Rommel Estropia 42a889a28e WIP: documentation 2016-03-14 07:57:49 +09:00
John Rommel Estropia 456977bf12 renamed default directories 2016-03-13 11:21:01 +09:00
John Rommel Estropia ea8412ab93 removed Nimble 2016-03-13 11:10:09 +09:00
John Rommel Estropia 603dffffb0 WIP: documentation and unit tests 2016-03-12 20:13:38 +09:00