Permalink
Commits on Jun 12, 2017
  1. Merge branch 'release/1.5' into develop

    saxix committed Jun 12, 2017
    * release/1.5:
      bump 1.5
  2. bump 1.5

    saxix committed Jun 12, 2017
  3. removes ipython from requirements

    saxix committed Jun 12, 2017
Commits on Jun 6, 2017
  1. removes password validators, not needed for demo

    saxix committed Jun 6, 2017
Commits on Jun 2, 2017
  1. update setup

    saxix committed Jun 2, 2017
Commits on Jun 1, 2017
Commits on May 23, 2017
  1. fixes som py3.4 tests

    saxix committed May 23, 2017
Commits on May 5, 2017
  1. trying to fix travis 4

    saxix committed May 5, 2017
  2. trying to fix travis 3

    saxix committed May 5, 2017
  3. trying to fix travis 2

    saxix committed May 5, 2017
  4. trying to fix travis 1

    saxix committed May 5, 2017
  5. update tox/travis

    saxix committed May 5, 2017
Commits on May 4, 2017
  1. update tox/travis

    saxix committed May 4, 2017
  2. use python 3.6 for travis

    saxix committed May 4, 2017
  3. fixes tests

    saxix committed May 4, 2017
  4. fixes doctest (again)

    saxix committed May 4, 2017
  5. fixes doctest

    saxix committed May 4, 2017
  6. allow travis failures on py36-dev

    saxix committed May 4, 2017
  7. removes xlwt-future for xlwt fue python 3.6 compatibility

    saxix committed May 4, 2017
    - add some tests
    - removes some old unused code
Commits on May 3, 2017
  1. add on_delete= attribute to tests

    saxix committed May 3, 2017
  2. removed wrong entries in travis config

    saxix committed May 3, 2017
  3. just pep8

    saxix committed May 3, 2017
  4. fixes fistures and added pillow to allow django 1.11 to pass the tests

    saxix committed May 3, 2017
  5. Merge branch 'develop' of github.com:saxix/django-adminactions into d…

    saxix committed May 3, 2017
    …evelop
    
    * 'develop' of github.com:saxix/django-adminactions:
      Add Python 3.6 check to setup.py
  6. Merge pull request #131 from johnfraney/develop

    saxix committed May 3, 2017
    Add Python 3.6 check to setup.py
Commits on May 2, 2017
  1. Add Python 3.6 check to setup.py

    johnfraney committed May 2, 2017
Commits on Apr 5, 2017
  1. Revert "Merge pull request #124 from int-ua/develop"

    saxix committed Apr 5, 2017
    This reverts commit 57e2cfb, reversing
    changes made to 23c5166.
Commits on Apr 4, 2017
  1. Merge pull request #128 from PetrDlouhy/fix/preserve_filters

    saxix committed Apr 4, 2017
    preserve query string parameters (namely filters) during merge action
  2. Merge pull request #127 from PetrDlouhy/develop

    saxix committed Apr 4, 2017
    don't crash if field.many_to_many is defined
  3. Merge pull request #124 from int-ua/develop

    saxix committed Apr 4, 2017
    Use master (selected) values during merge
  4. preserve query string parameters (namely filters) during merge action

    PetrDlouhy committed Apr 4, 2017
  5. don't crash if field.many_to_many is defined

    PetrDlouhy committed Apr 4, 2017
  6. Update the docs, removing notion that master gets all other values

    int-ua committed Apr 4, 2017
  7. Flipping tests for selecting master values during merge

    int-ua committed Apr 4, 2017