kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 09:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
455 Commits 7 Branches 20 Tags
master
Commit Graph

455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magical Panda Software
3d37bdb1e6 Trying to solve deadlock problems when checking for iCloud availability. 2012-04-27 13:09:14 -06:00
Saul Mora
d6d055bffd add logging of saving context 
fix default save method
 2012-03-27 15:50:20 +01:00
Saul Mora
039ad800aa Fix recursive save bug 
Save the background save queue when saving the main context
 2012-03-27 15:25:58 +01:00
Saul Mora
086dcecb72 Fix unit tests 2012-03-27 15:05:39 +01:00
Saul Mora
cd41226b9a regenerating shorthand methods 2012-03-27 15:01:25 +01:00
Saul Mora
ca7b412635 refactoring some messaging 
Add an assertion when retrieving the default context
 2012-03-27 15:00:03 +01:00
Saul Mora
25523d0d08 regenerating shorthand headers 2012-03-27 14:24:39 +01:00
Saul Mora
468b2d1210 Updating threading instructions 2012-03-27 13:57:16 +01:00
Saul Mora
f3eddb17a6 Add stricter build settings 
Add new Root Saving context in conjunction with the Default Context
 2012-03-27 13:39:55 +01:00
Saul Mora
221b97f6d9 fixing background save handlers to save in the background (duh) 2012-03-26 00:41:51 +01:00
Saul Mora
9f35eee171 moving method to more appropriate category 2012-03-26 00:18:47 +01:00
Saul Mora
94cf4b8809 Fixing broke unit tests 
removing distinction between import and update….all imports will verify relational integrity.
 2012-03-26 00:05:56 +01:00
Saul Mora
12582cc91d Merge branch '2.0' of github.com:magicalpanda/MagicalRecord into 2.0 
Conflicts:
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.m
 2012-03-15 11:53:20 +01:00
Saul Mora
73fd2c5536 Fix block retain cycle 2012-03-15 11:51:59 +01:00
Saul Mora
b1b9daba0a __weak blocks make crashes :( 2012-03-13 14:53:40 +01:00
Saul Mora
58b8af8f6b Fix ARC/Compiler strong retain warning 2012-03-13 14:37:49 +01:00
Saul Mora
73e8b7d3a5 Moving files around for easier import to Xcode 2012-03-13 14:29:50 +01:00
Saul Mora
ab7d099d93 minor cleanup 2012-03-13 14:04:58 +01:00
Saul Mora
e0f2492b61 Refactoring import methods and names 2012-03-12 17:49:04 +01:00
Saul Mora
e11f2e67b0 some changes to the background saving api… 
getting things to compile for the time being
 2012-03-09 17:40:19 +01:00
Saul Mora
c9c8d2473a Fix unit tests 
Extract out some more categories on NSManagedObjectContext
 2012-03-09 14:59:54 +01:00
Saul Mora
85fc4035d2 Merge branch 'iOS5-only' into 2.0 
Conflicts:
	MagicalRecord/Categories/NSManagedObject+MagicalDataImport.h
	MagicalRecord/Categories/NSManagedObject+MagicalDataImport.m
	MagicalRecord/Categories/NSManagedObjectContext+MagicalRecord.m
	MagicalRecord/Categories/NSPersistentStore+MagicalRecord.m
	MagicalRecord/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
	Source/Categories/NSManagedObject+MagicalRecord.h
	Source/Categories/NSManagedObject+MagicalRecord.m
	Source/CoreData+MagicalRecord.h
	Source/MagicalRecordHelpers.h
	Source/MagicalRecordHelpers.m
 2012-03-09 11:31:27 +01:00
Saul Mora
7d42e17ae5 Refactor save* method names 2012-03-08 23:35:05 +01:00
Saul Mora
9da8cf802d Fixing unit tests 2012-03-08 22:51:40 +01:00
Saul Mora
df242726d9 Extracted MagicalRecord helper methods into separate category files 2012-03-07 16:24:48 +01:00
Saul Mora
666550b444 Fixing unit tests to at least run 
moving project files around a little
 2012-03-06 19:59:06 +01:00
Saul Mora
b1314b7c2a File reorg, updating the README 2012-03-06 19:34:50 +01:00
Saul Mora
390e7f8126 Removing files not deleted during previous merge 2012-03-06 19:18:02 +01:00
Saul Mora
05b95c08fa Merge branch 'master' into 2.0 
Conflicts:
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/GHUnit
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Headers
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Resources
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Versions/Current
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Headers
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/OCHamcrest
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Resources
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Versions/Current
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Headers
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/OCMock
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Resources
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Versions/Current
	Project Files/Magical Record.xcodeproj/project.pbxproj
	Project Files/Unit Tests/MagicalDataImportTestCase.h
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/GHUnitIOS
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Headers
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Resources
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Versions/Current
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Headers
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/OCHamcrestIOS
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Resources
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Versions/Current
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Headers
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/OCMock
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Resources
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Versions/Current
 2012-03-06 19:14:22 +01:00
Saul Mora
c2ea71e3b4 reorganization of source and project files 2012-02-24 09:57:39 +01:00
Magical Panda Software
3879c65b60 Merge pull request #144 from BrianDoig/master 
[FIX] To many update bug
 2012-02-22 14:14:27 -08:00
Brian Doig
fddba06635 Merge branch 'master' of git://github.com/magicalpanda/MagicalRecord 2012-02-22 10:32:48 -08:00
Brian Doig
bf3bab1782 Fix another insert instead of update relationship bug that occurs with to-many relationships. 2012-02-22 10:27:45 -08:00
Saul Mora
3c03715da2 Merge pull request #125 from ElegantSoftware/master 
Compiling Mac side of the library
 2012-02-15 16:06:36 -08:00
Saul Mora
1ec25c8c0b Merge pull request #142 from emrosenf/master 
iCloud Fix and Instructions
 2012-02-15 16:02:30 -08:00
Evan Rosenfeld
051c8fb7b3 Update README.md 2012-02-15 15:06:30 -08:00
Evan Rosenfeld
adad52496a Update README.md 2012-02-15 15:05:47 -08:00
Evan Rosenfeld
9dddc5d278 [README] Provide iCloud details 2012-02-15 15:03:39 -08:00
Evan Rosenfeld
8415276615 [iCloud] iCloud will not work without a valid NSPersistentStoreUbiquitousContentNameKey, so use the application Bundle Identifier 2012-02-15 15:03:22 -08:00
Saul Mora
d342683f7d Merge pull request #137 from BrianDoig/master 
Fix nested update of json
 2012-02-03 13:45:02 -08:00
Saul Mora
5053bc820f use prefixed methods 2012-01-31 12:32:26 -07:00
Brian Doig
8c0a0847a9 Fix nested update that would change to import more than one level deep. 2012-01-30 18:15:22 -08:00
Saul Mora
97478ce328 update paramter to reflect object level importing 2012-01-29 17:25:41 -07:00
Saul Mora
b2158dbb39 don't warn on performSelector messages. 2012-01-25 10:14:15 -07:00
Saul Mora
8f6522b61c Renaming import methods to reflect general object usage (ie. importFromObject, not dictionary) 
Add helper to set default model from a bundle for a particular class. Useful for unit testing with OCUnit
 2012-01-25 09:57:12 -07:00
Saul Mora
f950ff1bd1 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord 2012-01-19 16:47:00 -07:00
Saul Mora
fe852e70f1 Updated mogenerator 2012-01-19 16:46:19 -07:00
Magical Panda Software
9e92b7dee5 Making things work more better for iOS5 and background queues 2012-01-16 12:50:56 -07:00
Magical Panda Software
6f9627d83b One more header fix 2012-01-16 00:24:33 -07:00
Magical Panda Software
18c0883442 Fixing evil merge conflict 2012-01-16 00:22:52 -07:00