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

  • 5b1442ed1b Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord Saul Mora 2011-12-08 10:47:52 -07:00
  • 81ba7e4cc4 Merge pull request #97 from pjaspers/patch-1 Magical Panda Software 2011-12-08 09:45:42 -08:00
  • 0a762917c3 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord Saul Mora 2011-12-08 10:38:03 -07:00
  • d698e27c25 Forgot one. Piet Jaspers 2011-12-08 16:48:57 +01:00
  • 5ed2c380eb Variable typo Piet Jaspers 2011-12-08 16:38:01 +01:00
  • 9a3c38903e Merge branch 'bugfix/fix_errors_and_warnings_under_non_arc' Cody Rayment 2011-12-07 09:58:00 -07:00
  • 8c75ec620d Can not use MR_AUTORELEASE like normal autorelease. Cody Rayment 2011-12-07 09:57:43 -07:00
  • ae36a95850 Merge branch 'feature/auto_detect_arc' Cody Rayment 2011-12-07 08:26:15 -07:00
  • da50cdc945 Use __has_feature(objc_arc) over __has_feature(objc_arr) Cody Rayment 2011-12-07 08:14:35 -07:00
  • 480c475ae9 Simplify logic for auto-detecting ARC Cody Rayment 2011-12-07 06:25:48 -07:00
  • 1d63691011 Simplify logic for auto-detecting ARC Cody Rayment 2011-12-07 06:25:48 -07:00
  • b04a088eda Merge branch 'feature/define_cleanup' Cody Rayment 2011-12-07 05:07:58 -07:00
  • df9e70484c Merge branch 'feature/log_in_debug_only' Cody Rayment 2011-12-07 05:07:53 -07:00
  • 681b428a55 Merge branch 'feature/auto_detect_arc' Cody Rayment 2011-12-07 05:07:40 -07:00
  • 04d6861056 Fix all compile errors and analyzer warnings. Cody Rayment 2011-12-07 04:20:01 -07:00
  • 17e215e790 Auto-detect ARC. Cody Rayment 2011-12-07 05:01:02 -07:00
  • 93c9ccec53 Don't need ((void)0)'s Cody Rayment 2011-12-07 04:41:06 -07:00
  • 911fd89eae Default to only log in debug builds. Cody Rayment 2011-12-07 04:35:22 -07:00
  • 64f8b6d59c Fixed compile problems and merge issues 1.8.1 Saul Mora 2011-12-05 20:48:15 -07:00
  • c8ffde36b4 Merged from pull request Saul Mora 2011-12-05 20:42:07 -07:00
  • 10a3fecf90 Some adjustments to the iCloud helpers Saul Mora 2011-12-05 20:40:26 -07:00
  • 18d984e363 Merge pull request #93 from NZKoz/master Magical Panda Software 2011-12-05 18:26:27 -08:00
  • 3dd7591d18 Default to using ARC Michael Koziarski 2011-12-06 15:21:40 +13:00
  • 2bcd117069 Add an MR_USE_ARC option that users can define themselves if they use arc Michael Koziarski 2011-12-06 14:38:20 +13:00
  • d1af0058f7 use the MR_RETAIN/MR_RELEASE/MR_AUTORELEASE macros everywhere Michael Koziarski 2011-12-06 14:37:55 +13:00
  • 911686cb1b Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord Saul Mora 2011-12-04 13:31:10 -05:00
  • 0dc65ac714 Merge branch 'preprocessor_fixes' of https://github.com/baron/MagicalRecord into merge-pull-request Saul Mora 2011-12-04 13:10:58 -05:00
  • f1722566ad regenerated entities Saul Mora 2011-12-04 13:10:34 -05:00
  • bba28d6c81 fix indentation Sam Baron 2011-12-03 22:00:12 +09:00
  • cfb19422bb fixes for preprocessor stuff for ARC Sam Baron 2011-12-03 21:56:31 +09:00
  • 1ad46a7f8c move logging to proper place Saul Mora 2011-11-30 00:15:05 -07:00
  • 3e19b336ef Add support for Importing ordered relationships; Added shouldImport: callback for any pre-import validation Saul Mora 2011-11-29 23:36:46 -07:00
  • f3d3f2b082 Bumped podspec Saul Mora 2011-11-29 01:27:19 -07:00
  • 719ffadd37 Add iCloud support 1.8 Saul Mora 2011-11-29 01:18:17 -07:00
  • a3074e98b2 Swizzle valueForUndefinedKey: method with MR_valueForUndefinedKey: on the object being imported to support data importing for undefined keys (ie. data wasn't included) without crashing (default behaivior) Saul Mora 2011-11-28 19:32:17 -07:00
  • 062953110a Making sure not defining MR_SHORTHAND does NOT include any unnecessary runtime changes Saul Mora 2011-11-28 17:19:31 -07:00
  • bbf2b80a79 Renamed ARLog to MRLog Saul Mora 2011-11-28 09:18:15 -07:00
  • d57fce8598 Merge branch 'master' of github.com:magicalpanda/MagicalRecord Saul Mora 2011-11-27 23:52:05 -07:00
  • 2fbb5e7251 Added some warning info for recent checkin. Should only matter to a select few who tinker with the ObjC Runtime Saul Mora 2011-11-27 23:51:50 -07:00
  • 326a86a543 Added rule to call back to user entities when importing data. Just implement 'import<Key>:' in your entities to get called back to perform custom handling of data attributes on import. Also refactored and cleaned up a few things Saul Mora 2011-11-27 23:43:21 -07:00
  • 09f0b310b9 Merge pull request #87 from alloy/master Magical Panda Software 2011-11-23 10:35:35 -08:00
  • 5311cbb07c Add CocoaPods spec. Eloy Duran 2011-11-22 23:59:43 +01:00
  • 7b76a36909 Merge pull request #86 from baron/missing_prefixes Magical Panda Software 2011-11-18 15:28:44 -08:00
  • a2c2784aad add remaining prefixes Sam Baron 2011-11-18 15:24:00 +09:00
  • 348e4b33a7 Fix compile issues for mac and iphone Saul Mora 2011-11-17 16:52:04 -07:00
  • 26d74eca7a Adding aggregate operation support submitted from Duane Fields. Thanks for submitting! 1.7.1 Saul Mora 2011-11-15 14:58:54 -07:00
  • 3e0b36c072 Added some macros to handle backwards, non-ARC compatibility Saul Mora 2011-11-15 14:50:11 -07:00
  • e65b43a2ed Forward deprecated method to proper background handling method Saul Mora 2011-11-15 13:59:35 -07:00
  • 5470cc640b Made the default managed object context section more clear. Added an example of the background save completion handler Saul Mora 2011-11-15 13:55:03 -07:00
  • 5effa4773c Include sub entities by default in searches Saul Mora 2011-11-15 13:23:06 -07:00
  • 34ed8015ac Added +entityName method for use when creating ManagedObjects and fetching objects. This can be overridden to match your entity. Support for the entityDescriptionInContext: method provided by mogenerator is also still used. Cleaned up the fetch methods naming convention. If a method starts with fetchAll, the fetch will be performed before the method returns. Added method to pass in fetch results controller delegate in fetchAll methods. 1.7 Saul Mora 2011-11-15 13:09:49 -07:00
  • 7643c5af05 Re-add fix for cleanup of background queue Saul Mora 2011-11-15 12:23:20 -07:00
  • bb8b1c28f7 Add new method to set default model from MagicalRecordHelpers class to so that it uses proper, prefixed methods to set the default prior to using the remainder of the MR stack Some minor cleanup Saul Mora 2011-11-15 12:21:58 -07:00
  • 49309a87ea Added compatibility with ARC **AND** non ARC settings/compilers Saul Mora 2011-11-15 12:03:09 -07:00
  • 4f63c7996e Don't escape path string twice; fixing test Saul Mora 2011-11-15 11:22:55 -07:00
  • b253cc8041 Remove all compile warnings by auto generating shorthand interface methods Saul Mora 2011-11-15 11:13:14 -07:00
  • e5439914b3 Shorthand header script generator Saul Mora 2011-11-15 09:48:11 -07:00
  • 068e1242ab Added last two prefixes to methods Saul Mora 2011-11-15 09:47:52 -07:00
  • bd16d3f6a2 Really finish adding MR_ category prefixes Saul Mora 2011-11-15 00:51:08 -07:00
  • df3bfc5d6c Completed adding MR_ prefix to internal methods Saul Mora 2011-11-15 00:41:30 -07:00
  • 71fbdab5c9 Cleaning up unused code Saul Mora 2011-11-15 00:13:58 -07:00
  • 1236931a36 Fixing style Saul Mora 2011-11-15 00:13:23 -07:00
  • 1f79f4d75a Moved method to proper entityDescription category file Saul Mora 2011-11-15 00:13:05 -07:00
  • e7856d3ec0 Removed short hand header files from project Saul Mora 2011-11-14 18:54:35 -07:00
  • 298c7eb53f Set the default persistent store when creating the coordinator Saul Mora 2011-11-14 18:52:42 -07:00
  • f444277878 Fix broken tests Saul Mora 2011-11-14 18:52:11 -07:00
  • 1e1d7c0444 Add runtime support for shorthand category methods. The runtime will remove MR_ if the message is passed to a core data object. Saul Mora 2011-11-14 18:50:56 -07:00
  • 47961cb2e2 Create helper methods to perform runtime forwarding of unprefixed methods Saul Mora 2011-11-07 23:34:15 -07:00
  • 6789935856 There has been much confusion as to where to put a persistent store. This should be the final change for proper support (unless apple modifies the guidelines). For more information, see the official Apple Docs: http://developer.apple.com/library/ios/documentation/FileManagement/Conceptual/FileSystemProgrammingGUide/FileSystemOverview/FileSystemOverview.html#//apple_ref/doc/uid/TP40010672-CH2-SW4 Saul Mora 2011-11-07 13:28:55 -07:00
  • 83b73554cc Persistent store helper was already moved to the Source folder, removed from the top level Saul Mora 2011-11-07 13:18:41 -07:00
  • 31d8ed269f Merge pull request #81 from foundationkit/master Saul Mora 2011-10-31 08:10:48 -07:00
  • 9941127b48 Follow coding style, fixed problems with wrong context Matthias Tretter 2011-10-31 15:25:21 +01:00
  • b7f357daac Added class-methods for deleting all objects matching a given predicate Matthias Tretter 2011-10-30 20:58:27 +01:00
  • 5dc11685d1 Silence warnings: missing selector Matthias Tretter 2011-10-30 20:54:42 +01:00
  • b9e35462fd Updating documentation Saul Mora 2011-09-16 15:57:36 -06:00
  • fdd2b71ea0 Refactor name prefixes from AR to MR Saul Mora 2011-09-16 15:06:18 -06:00
  • c2093d5abf Resolve more memory management issues with reverting from ARC Saul Mora 2011-09-16 14:59:58 -06:00
  • 25282657a0 minor build setting adjustments Saul Mora 2011-09-16 14:46:38 -06:00
  • 955867d47b Cleanup Saul Mora 2011-09-16 13:22:48 -06:00
  • 98da3f9f2d Implement last two tests: create context for current thread, notify default context on save Saul Mora 2011-09-05 18:23:16 -06:00
  • d172b7cb79 Add ocmock to project implement jogging target handler test Saul Mora 2011-09-05 18:15:25 -06:00
  • d1e310a6fa use contextForCurrentThread Saul Mora 2011-09-05 14:54:52 -06:00
  • 4c374be5a7 Fix Memory Leaks found through instruments Saul Mora 2011-09-05 14:13:25 -06:00
  • bee9f4a3cf Fix some data import tests Added data update tests Saul Mora 2011-09-05 12:30:01 -06:00
  • 3dfa3bf613 Fixing in memory store helper Saul Mora 2011-09-04 13:10:39 -06:00
  • 6c8316b635 Add in some minor memory management code change name of color parser method deprecated NSManagedObjectModel MR_newManagedObjectModel] method Fix compiler warning on Xcode 4.1 with 5.0 methods Saul Mora 2011-09-01 18:08:46 -06:00
  • 3986302684 Fixing some import logic Saul Mora 2011-09-01 17:29:23 -06:00
  • f20d404be5 If objectData contains null values, use that to clear out current value. Otherwise, if data isn't present in objectData, don't erase current value. Fix other edge case with date handling from json source data. Saul Mora 2011-08-22 17:50:36 -06:00
  • 3c0c80db17 fix date processing with custom format Saul Mora 2011-08-22 11:01:18 -06:00
  • e5d876a146 Improve date import handling Added secondary attribute key mapping support Added test for secondary relationship key mapping support Saul Mora 2011-08-18 16:15:38 -06:00
  • 9b09194d4b change background color gh-pages Saul Mora 2011-08-17 00:39:37 -06:00
  • d6bf4cc9b0 Replaced missing code removed from bad merge :( Saul Mora 2011-08-16 18:38:42 -06:00
  • 7dbdaf7289 Merge branch 'master' of github.com:magicalpanda/MagicalRecord Saul Mora 2011-08-16 18:35:00 -06:00
  • 117103de03 Added countOfEntities helpers to return only NSUInteger value rather than the NSNumber counter-parts, numberOfEntities Saul Mora 2011-08-16 18:30:51 -06:00
  • f687d11feb Add support for nested data mappings using keyPath-like notation Saul Mora 2011-08-16 16:21:43 -06:00
  • 890369abd4 Fixing some data import tests Saul Mora 2011-08-16 15:23:02 -06:00
  • c04b31c13c Adding tests for unique number of entities, however they're currently failing Saul Mora 2011-08-13 10:39:00 -06:00
  • df021d6506 Add simple test for creating requests Saul Mora 2011-08-12 15:04:45 -06:00
  • 88b58f2605 Fixing mapped import tests and functionality cleanup some code Saul Mora 2011-08-12 14:25:40 -06:00
  • 864408fae5 Writing more assertions to verify import is occurring properly Saul Mora 2011-08-11 17:15:37 -06:00