Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Jun 10, 2015
  1. Merge pull request #138 from mpyatishev/master

    authored
    deserialize changed_object for proxy model
  2. deserialize changed_object for proxy model

    Maxim Pyatishev authored
Commits on Jun 5, 2015
  1. Merge pull request #137 from ryuusenshi/updatedocs_moderatedmodel

    authored
    Update docs, add ModeratedModel
Commits on Jun 4, 2015
  1. @ryuusenshi
  2. @ryuusenshi
  3. Merge pull request #132 from sapiu/django18-modelform

    authored
    In Django 1.8, ModelForms must define either fields or exclude
  4. Merge pull request #135 from ryuusenshi/moderatedmodelimproved

    authored
    Enhanced ModeratedModel: embedded Moderator support
  5. Merge pull request #136 from aaw64/branch1

    authored
    Update .travis.yml
  6. @aaw64

    Update .travis.yml

    aaw64 authored
Commits on Jun 3, 2015
  1. @ryuusenshi
  2. @ryuusenshi
  3. @ryuusenshi
  4. @ryuusenshi
  5. @ryuusenshi

    clearer imports for db.py

    ryuusenshi authored
Commits on May 30, 2015
  1. @phillipberndt
Commits on May 28, 2015
  1. Merge pull request #130 from sapiu/fix-django18

    authored
    Django 1.9 compatibility
Commits on May 16, 2015
  1. @phillipberndt
  2. @phillipberndt
  3. @phillipberndt
  4. @phillipberndt
  5. @phillipberndt

    Django 1.9 compatibility

    phillipberndt authored
    This change fixes all deprecation warnings in Django 1.8 about
    functionality that will be gone in 1.9.
Commits on May 15, 2015
  1. @phillipberndt

    fixed #122

    Marc-Stefan Cassola authored phillipberndt committed
  2. @phillipberndt
  3. @phillipberndt

    Django 1.7 compatibility

    Marc-Stefan Cassola authored phillipberndt committed
    - updated some deprecated stuff
    - updated docs
    - fixed the test runner to maintain backward compatibility.
    - support for python 2.6 was officially removed from the version 1.7 of django
    - adjusted travis settings
    - added django version checks for querysets
    - reverted old migrations for pre-1.7
Commits on May 11, 2015
  1. Merge pull request #129 from ryuusenshi/moderatedmodel

    authored
    added ModeratedModel, fixes #128
Commits on May 6, 2015
  1. @ryuusenshi

    fixed PEP8 issues

    ryuusenshi authored
  2. @ryuusenshi
Commits on Oct 7, 2014
  1. Merge pull request #116 from aptivate/improve_multiple_mods_handling

    authored
    Throw an exception if there's multiple moderations for the same object.
  2. @qris

    Throw an exception if there's multiple moderations for the same object.

    qris authored
    There's no sensible default behaviour, so you'll need to override
    filter_moderated_objects to define what bevahiour you want. What if one
    moderation approves an object, and the other rejects it? What if one is
    still pending?
    
    Either way, the old code simply picked one moderation at random, and that's
    just broken.
Commits on Oct 3, 2014
  1. Merge pull request #118 from aptivate/test_admin_automoderate_preserv…

    authored
    …es_changes
    
    Test admin automoderate preserves changes
  2. Merge pull request #120 from aptivate/moderation_drafts_pr

    authored
    Hide rejected objects if never approved.
Commits on Sep 30, 2014
  1. @qris

    Hide rejected objects if never approved.

    qris authored
    The old behaviour is that rejected objects will always be displayed in
    querysets, which is weird.
    
    In my view, if an object has never been approved, it should be hidden. If
    it has been approved, but a change to it is rejected, then the change should
    be reverted and the object should continue to be visible, as it was when it
    was approved.
    
    This patch implements that behaviour by using the undocumented
    moderation_state column to put objects that have never been approved into
    DRAFT state, which hides them from the public but allows the admin to see
    them. Once an object has been approved once, its state becomes READY, and
    rejections don't change it back to DRAFT, they simply undo the changes.
    
    Note that this changes the behaviour of the moderation_state field slightly.
    In particular, the admin will be invited to moderate objects in DRAFT state,
    which previously they were not.
  2. @qris
  3. @qris

    Simplify ModerationManager.post_save_handler.

    qris authored
    Restructure the code to reduce nesting and improve readability.
  4. Merge pull request #119 from aptivate/dry_out_models_tests

    authored
    Refactor model tests to reduce duplicated code.
Something went wrong with that request. Please try again.