Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: crucialfelix/django-ajax-selects
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.5.2
Choose a base ref
...
head repository: crucialfelix/django-ajax-selects
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.6.0
Choose a head ref
  • 17 commits
  • 18 files changed
  • 2 contributors

Commits on Oct 19, 2016

  1. Merge branch 'release/1.5.2' into develop

    @crucialfelix
    crucialfelix committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    4c7fcbb View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2017

  1. Changed the build_attrs to work with Django==1.11.

    @xbello
    xbello committed Apr 12, 2017
    Configuration menu
    Copy the full SHA
    171a0ac View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. fix PR 193 - ignore ‘required’ attr when rendering the text fields. 

    Adds a test
    @crucialfelix
    crucialfelix committed May 16, 2017
    Configuration menu
    Copy the full SHA
    e782ce8 View commit details
    Browse the repository at this point in the history

  2. Update test requirements; drop support for Django 1.6

    @crucialfelix
    crucialfelix committed May 16, 2017
    Configuration menu
    Copy the full SHA
    e1d0d7b View commit details
    Browse the repository at this point in the history

  3. fix: build_attrs is supposed to merge self.attrs and any supplied attrs

    @crucialfelix
    crucialfelix committed May 16, 2017
    Configuration menu
    Copy the full SHA
    72abbe6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'xbello-develop' into develop 

    * xbello-develop:
  fix: build_attrs is supposed to merge self.attrs and any supplied attrs
  Changed the build_attrs to work with Django==1.11.

# Conflicts:
#	ajax_select/fields.py
#	tox.ini
    @crucialfelix
    crucialfelix committed May 16, 2017
    Configuration menu
    Copy the full SHA
    d9af961 View commit details
    Browse the repository at this point in the history

  5. travis: Remove django 1.6, add 1.11

    @crucialfelix
    crucialfelix committed May 16, 2017
    Configuration menu
    Copy the full SHA
    56e7a53 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2017

  1. Add python 3.6 to testing

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    049fc53 View commit details
    Browse the repository at this point in the history

  2. Revert testing for python 3.6 

    Due to travis issue:

travis-ci/travis-ci#4990
    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    7b63c9f View commit details
    Browse the repository at this point in the history

  3. Import django’s reverse from new location (1.10+), fallback to old lo… 

    …cation

Remove fallback for import flatatt for django < 1.7

Fix from @coagulant : f843143
    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    691dce5 View commit details
    Browse the repository at this point in the history

  4. Update makefiles

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    6ebe85f View commit details
    Browse the repository at this point in the history

  5. formatting: line length

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    a1279fa View commit details
    Browse the repository at this point in the history

  6. Cast type using the type of the field being referenced. 

    Usually this is just the pk type (int or string),
but if this is an inherited model then it has a rel using a OneToOneField
pointing to the base model.

Fixes: #153

Solution from here: #203
(original fork from @adsva is deleted so I cannot test and merge that)
    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    3c80b9d View commit details
    Browse the repository at this point in the history

  7. Update supported django and python versions

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    2411d39 View commit details
    Browse the repository at this point in the history

  8. gitignore build directory

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    12dacff View commit details
    Browse the repository at this point in the history

  9. Bump version, changelog, release notes

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    69a8cbb View commit details
    Browse the repository at this point in the history

  10. Merge branch 'release/1.6.0'

    @crucialfelix
    crucialfelix committed May 17, 2017
    Configuration menu
    Copy the full SHA
    0e03828 View commit details
    Browse the repository at this point in the history
Loading