Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for Django 2.0 #37

Merged
merged 11 commits into from
Nov 7, 2017
Merged

Support for Django 2.0 #37

merged 11 commits into from
Nov 7, 2017

Commits on Nov 2, 2017

  1. Added support for django 2.0 beta

    @mastizada
    mastizada committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    823ebf1 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. Merge branch 'master' into pr/34 

    * master:
  Simplify travis.yml build matrix
  Drop support for Python 3.2, 3.3
  Added Azerbaijani translation
  Add Brazilian Portuguese Translation (pt_BR)

Conflicts:
	tox.ini
    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    e8e65c2 View commit details
    Browse the repository at this point in the history

  2. Test on more Django/Python combinations; simplify tox.ini

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    46cc517 View commit details
    Browse the repository at this point in the history

  3. Add Django 2.0, Python 3.6 envs to travis.yml

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    f503be8 View commit details
    Browse the repository at this point in the history

  4. Update changelog

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    c5b86fa View commit details
    Browse the repository at this point in the history

  5. Change travis python version to 3.6

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    65c0970 View commit details
    Browse the repository at this point in the history

  6. Fix Django version

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    891c5a0 View commit details
    Browse the repository at this point in the history

  7. Try fixing travis python 3.5 build

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    dfb0683 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into pr/34 

    * master:
  Simplify travis/tox integration with tox-travis

Conflicts:
	.travis.yml
    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    0c20ecc View commit details
    Browse the repository at this point in the history

  9. Upgrade coverage

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    ba04811 View commit details
    Browse the repository at this point in the history

  10. Update supported Python/Django versions in README

    @yprez
    yprez committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    02e7408 View commit details
    Browse the repository at this point in the history