RestKit/Code at 6c351c1ef919a99e59c3fe520489b3fad5a29049 - RestKit - Gitea: Git with a cup of tea

kylefang/RestKit

mirror of https://github.com/zhigang1992/RestKit.git synced 2026-06-19 01:56:29 +08:00

Files

History

Blake Watters 6c351c1ef9 Merge branch 'updates' of https://github.com/ahinz/RestKit into seeding

Conflicts:
	Code/CoreData/RKManagedObjectStore.h
	Code/CoreData/RKManagedObjectStore.m

2011-03-05 13:06:21 -05:00

..

Merge branch 'updates' of https://github.com/ahinz/RestKit into seeding

2011-03-05 13:06:21 -05:00

Fixed crash during dealloc of RKClient due to initialization of baseURL observer using a blank host. Updated the object mapper to support class/keypath when loading a single object. Some updates to the UISpec harness to get things working again.

2011-02-25 14:42:50 -05:00

Merge branch 'updates' of https://github.com/ahinz/RestKit into seeding

2011-03-05 13:06:21 -05:00

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

Always return an NSManagedObjectContext from the NSThreadDictionary. Do not bless the one on the main thread. Ensure merges happen on the main thread.

2011-01-13 14:33:28 -05:00

RestKit.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00