Blake Watters 88a1b013fc Merge remote branch 'origin/0.9' into core-data-cleanup ...

Conflicts:
	Code/CoreData/CoreData.h
	Code/CoreData/RKManagedObjectStore.h
	Code/CoreData/RKManagedObjectStore.m
	Code/CoreData/RKObjectSeeder.h
	Code/CoreData/RKObjectSeeder.m
	Code/ObjectMapping/RKObjectLoader.m
	Code/ObjectMapping/RKObjectManager.m
	Code/ObjectMapping/RKObjectMapper.m
	RestKit.xcodeproj/project.pbxproj

2011-03-19 21:26:13 -04:00

..

ObjectMapping.h

Revert "Remove per-file copyrights"

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

RKDynamicRouter.h

Revert "Remove per-file copyrights"

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

RKDynamicRouter.m

Merge remote branch 'origin/0.9' into core-data-cleanup

2011-03-19 21:26:13 -04:00

RKObject.h

Revert "Remove per-file copyrights"

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

RKObject.m

Refactored the Rails router to respect properties specified by the model objects. Introduced new support to allow models to modify RESTful object loaders just before they are sent. Sample app completely works. Really fucking happy with how this is turning out!

2011-01-21 00:15:02 -05:00

RKObjectLoader.h

DiscussionBoard and RKTwitter now build properly. May fold the code back out of RKManagedObjectLoader tomorrow.

2011-02-13 02:19:53 -05:00

RKObjectLoader.m

Merge remote branch 'origin/0.9' into core-data-cleanup

2011-03-19 21:26:13 -04:00

RKObjectManager.h

Merge remote branch 'origin/0.9' into core-data-cleanup

2011-03-19 21:26:13 -04:00

RKObjectManager.m

Merge remote branch 'origin/0.9' into core-data-cleanup

2011-03-19 21:26:13 -04:00

RKObjectMappable.h

Merge branch 'master' of github.com:twotoasters/RestKit into core-data-cleanup

2011-02-21 20:25:01 -05:00

RKObjectMappable.m

Refactored the Rails router to respect properties specified by the model objects. Introduced new support to allow models to modify RESTful object loaders just before they are sent. Sample app completely works. Really fucking happy with how this is turning out!

2011-01-21 00:15:02 -05:00

RKObjectMapper.h

Merge remote branch 'origin/0.9' into core-data-cleanup

2011-03-19 21:26:13 -04:00

RKObjectMapper.m

Merge remote branch 'origin/0.9' into core-data-cleanup

2011-03-19 21:26:13 -04:00

RKObjectPropertyInspector.h

Revert "Remove per-file copyrights"

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

RKObjectPropertyInspector.m

Cleaning up some TODO's and such

2011-02-13 02:59:37 -05:00

RKRailsRouter.h

Revert "Remove per-file copyrights"

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

RKRailsRouter.m

Refactored the Rails router to respect properties specified by the model objects. Introduced new support to allow models to modify RESTful object loaders just before they are sent. Sample app completely works. Really fucking happy with how this is turning out!

2011-01-21 00:15:02 -05:00

RKRouter.h

Revert "Remove per-file copyrights"

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