kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-05-07 12:45:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9' into xml-parser

Browse Source 
Conflicts:
	Examples/RKTwitter/Classes/RKTwitterViewController.m
	README.md
	RestKit.xcodeproj/project.pbxproj
This commit is contained in:
Blake Watters
2011-03-27 22:29:19 -04:00
parent 6ae94fb0bf 5411f54d02
commit 227f35a20d
497 changed files with 6381 additions and 17051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBUser.m
View File

@@ -101,8 +101,7 @@ static DBUser* currentUser = nil;
RKObjectLoader* objectLoader = [[RKObjectManager sharedManager] objectLoaderWithResourcePath:@"/login" delegate:self];
objectLoader.method = RKRequestMethodPOST;
objectLoader.params = [NSDictionary dictionaryWithKeysAndObjects:@"user[username]", username, @"user[password]", password, nil];
objectLoader.targetObject = self;
objectLoader.managedObjectStore = [RKObjectManager sharedManager].objectStore;
objectLoader.targetObject = self;
[objectLoader send];
}

17
Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj
View File

@@ -63,6 +63,13 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
25825AF31337CEAC00C0E3D2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 73057FD11331AD2E001908EE;
remoteInfo = "RestKitJSONParser+JSONKit";
};
3F2562F812DBA4C800AFD2D1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
@@ -74,7 +81,7 @@
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 25956956126DF0A8004BAC4C;
remoteGlobalIDString = 255B7588133BABBF00ED76AD;
remoteInfo = RestKit;
};
3F45615112D7E2D900BE25AD /* PBXContainerItemProxy */ = {
@@ -1073,6 +1080,7 @@
A7A2D3AF12D7822D00683D6F /* libRestKitSupport.a */,
A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */,
A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */,
25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */,
A7A2D3B512D7822D00683D6F /* libRestKitCoreData.a */,
A7A2D3B712D7822D00683D6F /* libRestKitThree20.a */,
A7A2D3B912D7822D00683D6F /* UISpec.app */,
@@ -1137,6 +1145,13 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRestKitJSONParserJSONKit.a;
remoteRef = 25825AF31337CEAC00C0E3D2 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A7A2D3AB12D7822D00683D6F /* libRestKitNetwork.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;