Permalink
Commits on Jan 9, 2013
  1. Merge branch 'master' of https://github.com/magicalpanda/MagicalRecord

    Conflicts:
    	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
    tonyarnold committed Jan 9, 2013
  2. Merge branch 'release/2.1.0'

    Conflicts:
    	Changelog.md
    tonyarnold committed Jan 9, 2013
  3. Update changelog for 2.1.0

    tonyarnold committed Jan 9, 2013
Commits on Jan 8, 2013
  1. Merge pull request #370 from modocache/fix-dot-syntax-inconsistency

    Fix dot-syntax message inconsistency.
    casademora committed Jan 8, 2013
  2. Fix dot-syntax message inconsistency.

    Property dot-syntax used for non-property method despite different
    syntax used in the same method.
    modocache committed Jan 8, 2013
Commits on Jan 6, 2013
Commits on Jan 1, 2013
  1. Add Clang-style documentation for the MagicalSaves category.

    Also add Clang's -Wdocumentation warning to assist in writing in future documentation.
    tonyarnold committed Jan 1, 2013
  2. Execute save completion blocks on the main dispatch queue.

    Addresses #351 in the context of saving.
    tonyarnold committed Jan 1, 2013
Commits on Dec 28, 2012
  1. Merge pull request #350 from blackgold9/develop

    Added additional case that will trigger persistant store cleanup
    casademora committed Dec 28, 2012
Commits on Dec 20, 2012
  1. Merge pull request #346 from greenmobile/patch-1

    Update README.md
    casademora committed Dec 20, 2012
  2. Update README.md

    greenmobile committed Dec 20, 2012
Commits on Dec 18, 2012
  1. Merge pull request #345 from nerdery-isaac/develop

    Grammar and punctuation fixes to README
    tonyarnold committed Dec 18, 2012
  2. Minor text editing.

    nerdery-isaac committed with nerdery-isaac Dec 18, 2012
Commits on Dec 17, 2012
  1. Updated podspec to 2.1.beta.1

    blackgold9 committed Dec 17, 2012
Commits on Dec 16, 2012
  1. Merge branch 'hotfix/save-changes-for-2.1' into develop

    Conflicts:
    	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
    	Project Files/Magical Record.xcodeproj/project.pbxproj
    tonyarnold committed Dec 16, 2012
  2. Update shorthand methods and import the magical saves category so tha…

    …t MRSaveCompletionHandler resolves
    tonyarnold committed Dec 15, 2012
  3. Flesh out tests for MagicalRecord+Actions and the NSManagedObjectCont…

    …ext+MagicalSaves category
    tonyarnold committed Dec 14, 2012
  4. Update existing save tests to reflect save changes. Also begin adding…

    … tests for deprecated methods to ensure consistent behaviour in unmodified code.
    tonyarnold committed Dec 12, 2012
  5. Implement new save methods

    tonyarnold committed Nov 27, 2012
Commits on Dec 14, 2012
  1. Merge pull request #327 from heatherm/master

    Fix formatting of changelog
    tonyarnold committed Dec 14, 2012
Commits on Nov 30, 2012
  1. fix formatting in changelog

    heatherm committed Nov 30, 2012
Commits on Nov 27, 2012
  1. Merge pull request #322 from tonyarnold/develop

    Pass errorCallback through convenience method
    tonyarnold committed Nov 27, 2012