kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 17:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 8c3540b8be Minor Readme Updates Saul Mora 2012-05-19 09:46:21 -06:00
  • 38515e7535 Minor Readme Updates Saul Mora 2012-05-19 09:32:51 -06:00
  • 944345cb51 typechange frameworks for git 2.0 Saul Mora 2012-05-19 09:14:39 -06:00
  • f2e23bf660 Update project settings correct minor printf formats Saul Mora 2012-05-19 09:12:53 -06:00
  • 4045f01987 Update podspec for 2.0 Saul Mora 2012-05-19 09:06:04 -06:00
  • 4508422485 Re-saved model file with Xcode Saul Mora 2012-05-19 09:01:43 -06:00
  • 4931cc222d Fix unit test projects for Mac and iOS Saul Mora 2012-05-09 13:36:18 -06:00
  • 2fbd008fba Fix broken merge Remove references to NSFetchedResultsController for mac apps Saul Mora 2012-05-09 12:48:51 -06:00
  • 5c5ea831ec Fixing test frameworks :( Making each file more standalone for piecemeal includes, or to allow includes from other than the main PCH file Saul Mora 2012-05-09 12:42:56 -06:00
  • 3d37bdb1e6 Trying to solve deadlock problems when checking for iCloud availability. Magical Panda Software 2012-04-27 13:09:14 -06:00
  • d6d055bffd add logging of saving context fix default save method Saul Mora 2012-03-27 15:50:20 +01:00
  • 039ad800aa Fix recursive save bug Save the background save queue when saving the main context Saul Mora 2012-03-27 15:25:58 +01:00
  • 086dcecb72 Fix unit tests Saul Mora 2012-03-27 15:05:39 +01:00
  • cd41226b9a regenerating shorthand methods Saul Mora 2012-03-27 15:01:25 +01:00
  • ca7b412635 refactoring some messaging Add an assertion when retrieving the default context Saul Mora 2012-03-27 15:00:03 +01:00
  • 25523d0d08 regenerating shorthand headers Saul Mora 2012-03-27 14:24:39 +01:00
  • 468b2d1210 Updating threading instructions Saul Mora 2012-03-27 13:57:16 +01:00
  • f3eddb17a6 Add stricter build settings Add new Root Saving context in conjunction with the Default Context Saul Mora 2012-03-27 13:39:55 +01:00
  • 221b97f6d9 fixing background save handlers to save in the background (duh) Saul Mora 2012-03-26 00:41:51 +01:00
  • 9f35eee171 moving method to more appropriate category Saul Mora 2012-03-26 00:18:47 +01:00
  • 94cf4b8809 Fixing broke unit tests removing distinction between import and update….all imports will verify relational integrity. Saul Mora 2012-03-26 00:05:56 +01:00
  • 12582cc91d Merge branch '2.0' of github.com:magicalpanda/MagicalRecord into 2.0 Saul Mora 2012-03-15 11:53:20 +01:00
  • 73fd2c5536 Fix block retain cycle Saul Mora 2012-03-15 11:51:59 +01:00
  • b1b9daba0a __weak blocks make crashes :( Saul Mora 2012-03-13 14:53:40 +01:00
  • 58b8af8f6b Fix ARC/Compiler strong retain warning Saul Mora 2012-03-13 14:37:49 +01:00
  • 73e8b7d3a5 Moving files around for easier import to Xcode Saul Mora 2012-03-13 14:29:50 +01:00
  • ab7d099d93 minor cleanup Saul Mora 2012-03-13 14:04:58 +01:00
  • e0f2492b61 Refactoring import methods and names Saul Mora 2012-03-12 17:49:04 +01:00
  • e11f2e67b0 some changes to the background saving api… getting things to compile for the time being Saul Mora 2012-03-09 17:40:19 +01:00
  • c9c8d2473a Fix unit tests Extract out some more categories on NSManagedObjectContext Saul Mora 2012-03-09 14:59:54 +01:00
  • 85fc4035d2 Merge branch 'iOS5-only' into 2.0 Saul Mora 2012-03-09 11:31:27 +01:00
  • 7d42e17ae5 Refactor save* method names Saul Mora 2012-03-08 23:35:05 +01:00
  • 9da8cf802d Fixing unit tests Saul Mora 2012-03-08 22:51:40 +01:00
  • df242726d9 Extracted MagicalRecord helper methods into separate category files Saul Mora 2012-03-07 16:24:48 +01:00
  • 666550b444 Fixing unit tests to at least run moving project files around a little Saul Mora 2012-03-06 19:59:06 +01:00
  • b1314b7c2a File reorg, updating the README Saul Mora 2012-03-06 19:34:50 +01:00
  • 390e7f8126 Removing files not deleted during previous merge Saul Mora 2012-03-06 19:18:02 +01:00
  • 05b95c08fa Merge branch 'master' into 2.0 Saul Mora 2012-03-06 19:14:22 +01:00
  • c2ea71e3b4 reorganization of source and project files Saul Mora 2012-02-24 09:57:39 +01:00
  • 3879c65b60 Merge pull request #144 from BrianDoig/master Magical Panda Software 2012-02-22 14:14:27 -08:00
  • fddba06635 Merge branch 'master' of git://github.com/magicalpanda/MagicalRecord Brian Doig 2012-02-22 10:32:48 -08:00
  • bf3bab1782 Fix another insert instead of update relationship bug that occurs with to-many relationships. Brian Doig 2012-02-22 10:27:45 -08:00
  • 3c03715da2 Merge pull request #125 from ElegantSoftware/master Saul Mora 2012-02-15 16:06:36 -08:00
  • 1ec25c8c0b Merge pull request #142 from emrosenf/master Saul Mora 2012-02-15 16:02:30 -08:00
  • 051c8fb7b3 Update README.md Evan Rosenfeld 2012-02-15 15:06:30 -08:00
  • adad52496a Update README.md Evan Rosenfeld 2012-02-15 15:05:47 -08:00
  • 9dddc5d278 [README] Provide iCloud details Evan Rosenfeld 2012-02-15 15:03:39 -08:00
  • 8415276615 [iCloud] iCloud will not work without a valid NSPersistentStoreUbiquitousContentNameKey, so use the application Bundle Identifier Evan Rosenfeld 2012-02-15 15:03:22 -08:00
  • d342683f7d Merge pull request #137 from BrianDoig/master Saul Mora 2012-02-03 13:45:02 -08:00
  • 5053bc820f use prefixed methods Saul Mora 2012-01-31 12:32:26 -07:00
  • 8c0a0847a9 Fix nested update that would change to import more than one level deep. Brian Doig 2012-01-30 18:15:22 -08:00
  • 97478ce328 update paramter to reflect object level importing Saul Mora 2012-01-29 17:25:41 -07:00
  • b2158dbb39 don't warn on performSelector messages. Saul Mora 2012-01-25 10:14:15 -07:00
  • 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 Saul Mora 2012-01-25 09:57:12 -07:00
  • f950ff1bd1 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord Saul Mora 2012-01-19 16:47:00 -07:00
  • fe852e70f1 Updated mogenerator Saul Mora 2012-01-19 16:46:19 -07:00
  • 9e92b7dee5 Making things work more better for iOS5 and background queues Magical Panda Software 2012-01-16 12:50:56 -07:00
  • 6f9627d83b One more header fix Magical Panda Software 2012-01-16 00:24:33 -07:00
  • 18c0883442 Fixing evil merge conflict Magical Panda Software 2012-01-16 00:22:52 -07:00
  • f806ef5eee Use performBlockAndWait for all context interactions Renamed import methods to reflect id parameter (objects, not just dictionaries) Added findOrCreate pattern method Added error callback in default error handler method Magical Panda Software 2012-01-15 23:52:44 -07:00
  • 6928c16345 Adding recursive save of context Saul Mora 2012-01-11 14:57:31 -07:00
  • 77c38d85b7 - Added by Xcode. Richard Skala 2012-01-11 12:03:17 -08:00
  • a5672d9c75 Scheme changed Brian Doig 2012-01-05 15:56:19 -08:00
  • 33758e7771 First commit from this machine Brian Doig 2012-01-05 12:32:50 -08:00
  • 298bbf1304 Accidentially added the unit test xcdatamodel to project, causing the mogenerator scripts to be invoked during a compile. Removed files created by accident. Brian Doig 2012-01-04 12:46:44 -08:00
  • 5fe9545abd changed variable not to not be a C++ reserved word 'class' that prevented precompiled headers to be created for Objective-C++ Brian Doig 2012-01-04 12:42:05 -08:00
  • c8b6fa9c66 Initial commit with fix of two compile problems due to missing headers when pre compiled header file not included. Brian Doig 2012-01-04 12:40:48 -08:00
  • 1195ae1191 Merge branch 'magical_master' Greg Furmanek 2011-12-30 20:29:43 -08:00
  • 5901ad6c4f updated gitignore Greg Furmanek 2011-12-30 20:29:21 -08:00
  • fe59756d04 Merge pull request #123 from vojto/master Magical Panda Software 2011-12-29 09:18:17 -08:00
  • 6756aef886 Fixing an issue that would cause EXC_BAD_ACCESS when property is not found. Vojto Rinik 2011-12-29 18:09:55 +01:00
  • 59f179e9a7 compiling mac side Greg Furmanek 2011-12-28 23:28:53 -08:00
  • eb4aaec679 Merge pull request #121 from tonyxiao/master Magical Panda Software 2011-12-28 20:23:26 -08:00
  • feffba86e7 Update Readme.md to reflect recent changes, especially the MR_SHORTHAND macro tonyxiao 2011-12-28 23:19:53 -05:00
  • 5452a2946f Added in test for iOS target in MagicalRecordShorthand.h to make it compile on Mac-only targets Tony Xiao 2011-12-28 23:10:19 -05:00
  • 73ceae7e66 Merge pull request #120 from rickerbh/fix-icloud-queue-error Magical Panda Software 2011-12-28 20:06:27 -08:00
  • 121020a2c9 Modified macro to avoid "Can only use -performBlock" error rickerbh 2011-12-29 15:03:45 +11:00
  • 2209c3e3a7 Added support for easy setup with OCTest Saul Mora 2011-12-28 19:26:53 -07:00
  • 6b4ef06007 Reusing other request methods where possible Fix enumeration problem in updateFromArray Saul Mora 2011-12-17 18:57:00 -07:00
  • 0c4ea10ba6 Fix: Crash when fetching with findByAttribute:withValue: Add more safety checks between iOS4 and iOS5 add updateFromArray method for data import Saul Mora 2011-12-17 18:04:36 -07:00
  • 667738a6c1 Merge pull request #108 from tonyarnold/master Magical Panda Software 2011-12-12 22:35:23 -08:00
  • 260d86c5e1 Fix clang warning Tony Arnold 2011-12-13 17:10:01 +11:00
  • 7c54dd558c Removed all release/retain/autorelease macros for backward comatibility Saul Mora 2011-12-11 14:31:55 -07:00
  • 7567e75e17 Fix crash when setting main context as parent in background on iOS5 Readd (again) checks for iCloud changes to background contexts Saul Mora 2011-12-11 14:24:14 -07:00
  • bc4ae81023 Fix compile error for assoc. reference key re-compiled entities with latest version of mogenerator 1.8.3 Saul Mora 2011-12-11 14:02:13 -07:00
  • b446251c21 Merge https://github.com/crayment/MagicalRecord into log-in-debug Saul Mora 2011-12-11 13:29:02 -07:00
  • be9d5c44ee Include all sub entities by default when deleting using a predicate Saul Mora 2011-12-11 13:19:08 -07:00
  • 52aaff9487 Adjusting tests for context notifications to depend on which platform is running. Saul Mora 2011-12-11 13:16:46 -07:00
  • 6e2cfd8151 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord Saul Mora 2011-12-11 13:05:26 -07:00
  • a689dfe612 Fix broken tests on iOS4.3 and iOS5 Fix data import on iOS4.3 Saul Mora 2011-12-11 13:05:15 -07:00
  • abb22bebdc Merge pull request #107 from SeriousMonster/6d94f4ae1b2c460d06c2fa1793e655026e55986a Magical Panda Software 2011-12-11 09:48:31 -08:00
  • 6d94f4ae1b added aggregate methods to shorthand file Duane Fields 2011-12-11 11:00:34 -06:00
  • aba82b2619 added aggregate methods to the category header and renamed to use MR_ prefix Duane Fields 2011-12-10 14:05:02 -06:00
  • 07538d5a1a Fix: Set the default store properly when creating a new default context Saul Mora 2011-12-10 10:32:23 -07:00
  • 6de353f3d1 Refactor tests to use property name different from super class Saul Mora 2011-12-10 10:31:47 -07:00
  • 78262cbad7 Fix: extract NSString categories to external file Saul Mora 2011-12-10 10:31:11 -07:00
  • 8938488d2e Fix Core Foundation version number. Merge from 25e5029164 was overwritten somehow too :( 1.8.2 Saul Mora 2011-12-08 12:55:17 -07:00
  • 3cf33f47ae Check for iCloud in particular operations Saul Mora 2011-12-08 12:52:48 -07:00
  • db986748c4 Using descriptive macros to help imply reason for certain method calls, ie. initWithConcurrencyType: Saul Mora 2011-12-08 12:38:10 -07:00
  • ac1135c23a merging fixes for iOS4 Saul Mora 2011-12-08 12:24:49 -07:00