Tony Arnold
477049d77b
Merge branch 'master' of https://github.com/magicalpanda/MagicalRecord
...
Conflicts:
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
2013-01-09 20:05:16 +11:00
Tony Arnold
94855465fe
Merge branch 'release/2.1.0'
...
Conflicts:
Changelog.md
2013-01-09 19:59:42 +11:00
Tony Arnold
15891e9a1d
Update changelog for 2.1.0
2013-01-09 19:54:38 +11:00
Tony Arnold
46b6004732
Update pod spec to MagicalRecord 2.1.0
2013-01-09 19:50:49 +11:00
Tony Arnold
f370cdbfac
Finalise documentation for MagicalRecord 2.1.0
2013-01-09 19:47:26 +11:00
Saul Mora
9d7bca42fb
Merge pull request #370 from modocache/fix-dot-syntax-inconsistency
...
Fix dot-syntax message inconsistency.
2013-01-08 08:49:16 -08:00
modocache
c5721aa01f
Fix dot-syntax message inconsistency.
...
Property dot-syntax used for non-property method despite different
syntax used in the same method.
2013-01-08 11:44:42 -05:00
Tony Arnold
5a40bcc8de
Remove unused notification constant
2013-01-07 09:13:22 +11:00
Tony Arnold
eb8865ae67
Add Clang-style documentation for the MagicalSaves category.
...
Also add Clang's -Wdocumentation warning to assist in writing in future documentation.
2013-01-02 08:44:20 +11:00
Tony Arnold
0c83121cb0
Fix broken GHUnit tests after recent changes to the save methods
2013-01-02 01:05:33 +11:00
Tony Arnold
065352d80d
Execute save completion blocks on the main dispatch queue.
...
Addresses #351 in the context of saving.
2013-01-02 00:56:17 +11:00
Tony Arnold
357b62e323
Alter saveWithBlock: so that it runs asynchronously. Fixes #349 .
2013-01-02 00:56:07 +11:00
Saul Mora
ec82bfc865
Merge pull request #350 from blackgold9/develop
...
Added additional case that will trigger persistant store cleanup
2012-12-27 18:52:59 -08:00
Stephen Vanterpool
36d1630f8e
Added additional case that will trigger persistant store cleanup
2012-12-27 16:03:45 -08:00
Saul Mora
4775d88d56
Merge pull request #346 from greenmobile/patch-1
...
Update README.md
2012-12-20 08:37:10 -08:00
greenmobile
648efa8993
Update README.md
2012-12-20 16:05:42 +01:00
Tony Arnold
3fac1a83c0
Merge pull request #345 from nerdery-isaac/develop
...
Grammar and punctuation fixes to README
2012-12-18 13:37:57 -08:00
nerdery-isaac
710d643efa
Minor text editing.
2012-12-18 15:33:15 -06:00
Stephen Vanterpool
5ed45f64b5
Updated podspec to 2.1.beta.1
2012-12-17 00:07:40 -08:00
Tony Arnold
8faae62fbc
Merge branch 'hotfix/save-changes-for-2.1' into develop
...
Conflicts:
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
Project Files/Magical Record.xcodeproj/project.pbxproj
2012-12-16 20:58:40 +11:00
Tony Arnold
1af1201096
Update shorthand methods and import the magical saves category so that MRSaveCompletionHandler resolves
2012-12-16 20:39:34 +11:00
Tony Arnold
4316422da7
Update README with details of the changes in this branch
2012-12-16 20:39:34 +11:00
Tony Arnold
c2fa8c4859
All deprecated and non-deprecated methods have tests to ensure their function
2012-12-16 20:39:34 +11:00
Tony Arnold
2c66056016
The deprecated saveWithBlock: method should do it's work on the current thread
2012-12-16 20:39:34 +11:00
Tony Arnold
a28d4210ac
Flesh out tests for MagicalRecord+Actions and the NSManagedObjectContext+MagicalSaves category
2012-12-16 20:39:34 +11:00
Tony Arnold
55af799d60
Add Kiwi for saner asynchronous testing and remove existing GHUnit tests for save methods
2012-12-16 20:39:29 +11:00
Tony Arnold
d0e771d778
Update gitignore and remove user specific xcuserdata
2012-12-16 20:39:01 +11:00
Tony Arnold
af84aff8f1
Fix compilation problems under latest Xcode.
2012-12-16 20:39:01 +11:00
Tony Arnold
c763d4ad91
Update existing save tests to reflect save changes. Also begin adding tests for deprecated methods to ensure consistent behaviour in unmodified code.
2012-12-16 20:39:01 +11:00
Tony Arnold
4f35e4e399
Implement new save methods
2012-12-16 20:38:59 +11:00
Tony Arnold
085e9289ac
Merge pull request #327 from heatherm/master
...
Fix formatting of changelog
2012-12-14 02:14:06 -08:00
Heather
239a245b7e
fix formatting in changelog
2012-11-30 15:59:05 -08:00
Tony Arnold
f25a5bcfb5
Merge branch 'master' into develop
2012-11-28 08:37:33 +11:00
Tony Arnold
f6cf96d266
Merge pull request #322 from tonyarnold/develop
...
Pass errorCallback through convenience method
2012-11-27 13:14:30 -08:00
Tony Arnold
537670080b
Pass errorCallback through convenience method
2012-11-28 08:12:51 +11:00
Saul Mora
144062347c
Minor formatting updates
2012-11-25 23:31:19 -07:00
Stephen Vanterpool
cfccd407f4
Re-Added obtaining permanent ids automatically
2012-11-13 19:58:55 -08:00
Stephen Vanterpool
20f02bac9f
Updating changelog
2012-11-04 15:21:43 -08:00
Stephen Vanterpool
5e836fb9a5
Merge branch 'release/2.0.8' into develop
2012-11-04 15:20:08 -08:00
Stephen Vanterpool
8861927036
Merge branch 'release/2.0.8'
2012-11-04 15:19:52 -08:00
Stephen Vanterpool
fb81b5b737
Bumping podspec version
2012-11-04 15:17:29 -08:00
Stephen Vanterpool
b5e5716307
Merge branch 'develop' of github.com:magicalpanda/MagicalRecord into develop
2012-11-01 11:39:27 -07:00
Stephen Vanterpool
3656e74d63
Fixed Issue #294 - MR_requestAllSortedBy:ascending:inContext: did not use correct context
2012-11-01 11:39:19 -07:00
Saul Mora
c0a1657acc
Added fetchAllWithDelegate: method for NSFRC
2012-10-30 19:17:52 -07:00
Saul Mora
0af0731093
Merging with origin/develop
2012-10-30 09:05:06 -07:00
Saul Mora
0fb7d36f4d
Separate printing context chain method into its own method
...
change contextWorkingName to property workingName
2012-10-30 09:03:56 -07:00
Stephen Vanterpool
f7c4350e9d
removed MR_saveErrorHandler, as it and MR_saveWithErrorCallback were essentially duplicates
...
MR_save now only saves the current context (it was essentially doing a MR_saveNestedContexts). If you need to save all the way out to disk, use MR_saveNestedContexts.
Removed the action queue, unneccesary since core data introduced it's own queue support
2012-10-25 16:18:43 -07:00
Saul Mora
64a81c6ff3
don't check the error, rely only on the return value of methods to determine success
2012-10-23 23:08:10 -07:00
Saul Mora
3c24ce151b
no message
2012-10-23 23:06:48 -07:00
Saul Mora
2eaec27410
Cleanup contextWillSave method
...
Update deleting incompatible store
2012-10-23 23:05:52 -07:00
