kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-04-30 04:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
365 Commits 7 Branches 20 Tags
8f930700bdcc85d92d021eb96f52d9845c0f2f92
Commit Graph

365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saul Mora
ac1135c23a merging fixes for iOS4 2011-12-08 12:24:49 -07:00
Saul Mora
5b1442ed1b Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord 2011-12-08 10:47:52 -07:00
Magical Panda Software
81ba7e4cc4 Merge pull request #97 from pjaspers/patch-1 
Variable typo. Thanks, I must have merged a couple different local branches I had...
 2011-12-08 09:45:42 -08:00
Saul Mora
0a762917c3 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord 2011-12-08 10:38:03 -07:00
Piet Jaspers
d698e27c25 Forgot one. 2011-12-08 16:48:57 +01:00
Piet Jaspers
5ed2c380eb Variable typo 
Since coordinator is used in the rest of the file (instead of psc), I went for
coordinator
 2011-12-08 16:38:01 +01:00
Cody Rayment
9a3c38903e Merge branch 'bugfix/fix_errors_and_warnings_under_non_arc' 2011-12-07 09:58:00 -07:00
Cody Rayment
8c75ec620d Can not use MR_AUTORELEASE like normal autorelease. 2011-12-07 09:57:43 -07:00
Cody Rayment
ae36a95850 Merge branch 'feature/auto_detect_arc' 2011-12-07 08:26:15 -07:00
Cody Rayment
da50cdc945 Use __has_feature(objc_arc) over __has_feature(objc_arr) 2011-12-07 08:14:35 -07:00
Cody Rayment
480c475ae9 Simplify logic for auto-detecting ARC 2011-12-07 06:27:48 -07:00
Cody Rayment
1d63691011 Simplify logic for auto-detecting ARC 2011-12-07 06:25:48 -07:00
Cody Rayment
b04a088eda Merge branch 'feature/define_cleanup' 2011-12-07 05:07:58 -07:00
Cody Rayment
df9e70484c Merge branch 'feature/log_in_debug_only' 2011-12-07 05:07:53 -07:00
Cody Rayment
681b428a55 Merge branch 'feature/auto_detect_arc' 2011-12-07 05:07:40 -07:00
Cody Rayment
04d6861056 Fix all compile errors and analyzer warnings. 
These could only be seen under non-ARC and are real issues.
 2011-12-07 05:06:51 -07:00
Cody Rayment
17e215e790 Auto-detect ARC. 2011-12-07 05:06:08 -07:00
Cody Rayment
93c9ccec53 Don't need ((void)0)'s 2011-12-07 04:45:06 -07:00
Cody Rayment
911fd89eae Default to only log in debug builds. 2011-12-07 04:44:15 -07:00
Saul Mora
64f8b6d59c Fixed compile problems and merge issues 1.8.1 2011-12-05 20:48:15 -07:00
Saul Mora
c8ffde36b4 Merged from pull request 2011-12-05 20:42:07 -07:00
Saul Mora
10a3fecf90 Some adjustments to the iCloud helpers 2011-12-05 20:40:26 -07:00
Magical Panda Software
18d984e363 Merge pull request #93 from NZKoz/master 
Fixes for the MR_* macros when ARC is not enabled.
 2011-12-05 18:26:27 -08:00
Michael Koziarski
3dd7591d18 Default to using ARC 2011-12-06 15:21:40 +13:00
Michael Koziarski
2bcd117069 Add an MR_USE_ARC option that users can define themselves if they use arc 2011-12-06 14:38:20 +13:00
Michael Koziarski
d1af0058f7 use the MR_RETAIN/MR_RELEASE/MR_AUTORELEASE macros everywhere 2011-12-06 14:37:55 +13:00
Saul Mora
911686cb1b Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord 2011-12-04 13:31:10 -05:00
Saul Mora
0dc65ac714 Merge branch 'preprocessor_fixes' of https://github.com/baron/MagicalRecord into merge-pull-request 2011-12-04 13:10:58 -05:00
Saul Mora
f1722566ad regenerated entities 2011-12-04 13:10:34 -05:00
Sam Baron
bba28d6c81 fix indentation 2011-12-03 22:00:12 +09:00
Sam Baron
cfb19422bb fixes for preprocessor stuff for ARC 2011-12-03 21:56:31 +09:00
Saul Mora
1ad46a7f8c move logging to proper place 2011-11-30 00:15:05 -07:00
Saul Mora
3e19b336ef Add support for Importing ordered relationships; Added shouldImport: callback for any pre-import validation 2011-11-29 23:36:46 -07:00
Saul Mora
f3d3f2b082 Bumped podspec 2011-11-29 01:27:19 -07:00
Saul Mora
719ffadd37 Add iCloud support 1.8 2011-11-29 01:18:17 -07:00
Saul Mora
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) 2011-11-28 19:32:17 -07:00
Saul Mora
062953110a Making sure not defining MR_SHORTHAND does NOT include any unnecessary runtime changes 2011-11-28 17:19:31 -07:00
Saul Mora
bbf2b80a79 Renamed ARLog to MRLog 2011-11-28 09:18:15 -07:00
Saul Mora
d57fce8598 Merge branch 'master' of github.com:magicalpanda/MagicalRecord 2011-11-27 23:52:05 -07:00
Saul Mora
2fbb5e7251 Added some warning info for recent checkin. Should only matter to a select few who tinker with the ObjC Runtime 2011-11-27 23:51:50 -07:00
Saul Mora
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 2011-11-27 23:43:21 -07:00
Magical Panda Software
09f0b310b9 Merge pull request #87 from alloy/master 
Add CocoaPods pod spec.
 2011-11-23 10:35:35 -08:00
Eloy Duran
5311cbb07c Add CocoaPods spec. 2011-11-22 23:59:43 +01:00
Magical Panda Software
7b76a36909 Merge pull request #86 from baron/missing_prefixes 
add remaining prefixes
 2011-11-18 15:28:44 -08:00
Sam Baron
a2c2784aad add remaining prefixes 2011-11-18 15:24:00 +09:00
Saul Mora
348e4b33a7 Fix compile issues for mac and iphone 2011-11-17 16:52:04 -07:00
Saul Mora
26d74eca7a Adding aggregate operation support submitted from Duane Fields. Thanks for submitting! 1.7.1 2011-11-15 14:58:54 -07:00
Saul Mora
3e0b36c072 Added some macros to handle backwards, non-ARC compatibility 2011-11-15 14:50:11 -07:00
Saul Mora
e65b43a2ed Forward deprecated method to proper background handling method 2011-11-15 13:59:35 -07:00
Saul Mora
5470cc640b Made the default managed object context section more clear. 
Added an example of the background save completion handler
 2011-11-15 13:55:03 -07:00