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
|
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
|
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
|
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
|
e99d19d2ac
|
ListMonitor and ObjectMonitor objective C bridge
|
2016-03-29 14:15:57 +09:00 |
|
John Estropia
|
e9ac8629a1
|
tidy up
|
2016-03-28 19:35:09 +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
|
90369cf994
|
WIP: simpler bridging
|
2016-03-24 21:22:58 +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
|
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 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 Estropia
|
6822a4579e
|
WIP: clean up persistent store setup
|
2016-03-10 20:19:52 +09:00 |
|
John Estropia
|
c86ca06bd4
|
Swift Package Manager support
|
2016-03-09 17:47:46 +09:00 |
|