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: TrevorScheitrum/django-jquery-file-upload
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sigurdga/django-jquery-file-upload
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 25 files changed
  • 6 contributors

Commits on May 22, 2015

  1. Fix project structure to Django 1.8

    @dolgiyspb
    dolgiyspb committed May 22, 2015
    Configuration menu
    Copy the full SHA
    9957fcc View commit details
    Browse the repository at this point in the history

  2. Fix using django.utils.simplejson. Now use json.

    @dolgiyspb
    dolgiyspb committed May 22, 2015
    Configuration menu
    Copy the full SHA
    fe06a23 View commit details
    Browse the repository at this point in the history

  3. Add 'fields' to PictureCreateView

    @dolgiyspb
    dolgiyspb committed May 22, 2015
    Configuration menu
    Copy the full SHA
    3a9ea7f View commit details
    Browse the repository at this point in the history

  4. Fix serve media files path

    @dolgiyspb
    dolgiyspb committed May 22, 2015
    Configuration menu
    Copy the full SHA
    82155f3 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2015

  1. Merge pull request sigurdga#59 from dolgiyspb/django-1.8 

    Django 1.8 support
    @sigurdga
    sigurdga committed May 23, 2015
    Configuration menu
    Copy the full SHA
    76dda2c View commit details
    Browse the repository at this point in the history

  2. Still saving images to /media under django-jquery-file-upload app.

    @sigurdga
    sigurdga committed May 23, 2015
    Configuration menu
    Copy the full SHA
    8b7bb90 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Upgrade to Django 1.9

    @sigurdga
    sigurdga committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    a9b307c View commit details
    Browse the repository at this point in the history

  2. Update README to use migrate instead of syncdb.

    @sigurdga
    sigurdga committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    ff8631f View commit details
    Browse the repository at this point in the history

  3. Escaping rules has changed in Django 1.9. 

    Using mark_safe for the template.

Fixes sigurdga#61
    @sigurdga
    sigurdga committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    da99c92 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Fix requirements.txt: Setting django version to 1.9 and pillow to 5.0.0

    Alejandro Brunacci authored and Alejandro Brunacci committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    d9ac52d View commit details
    Browse the repository at this point in the history

  2. Merge pull request sigurdga#71 from Abrunacci/django1.9 

    Fix requirements.txt: Setting django version to 1.9 and pillow to 5.0.0
    @sigurdga
    sigurdga authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    dacbbe3 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Upgrade to Django 2.0(.2) 

    Changes needed since url library has been rewritten in this version of
Django.
    @sigurdga
    sigurdga committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    74e34df View commit details
    Browse the repository at this point in the history

  2. Upgrade README after upgrading to Django 2 and Python 3

    @sigurdga
    sigurdga committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    04efb0c View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. Bump pillow from 5.0.0 to 6.2.0 

    Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.0.0 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@5.0.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Oct 22, 2019
    Configuration menu
    Copy the full SHA
    f487163 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Add trailing slashes for newer versions of Django (default settings)

    @mattchatterley
    mattchatterley committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    eb4d548 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Merge pull request sigurdga#80 from Codentia/master 

    Add trailing slashes for newer versions of Django (default settings)
    @sigurdga
    sigurdga authored Aug 11, 2020
    Configuration menu
    Copy the full SHA
    7278b9e View commit details
    Browse the repository at this point in the history

  2. Merge pull request sigurdga#79 from sigurdga/dependabot/pip/pillow-6.2.0 

    Bump pillow from 5.0.0 to 6.2.0
    @sigurdga
    sigurdga authored Aug 11, 2020
    Configuration menu
    Copy the full SHA
    f8b80d3 View commit details
    Browse the repository at this point in the history

  3. Update django dependency to newer django 2

    @sigurdga
    sigurdga committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    8a57454 View commit details
    Browse the repository at this point in the history

  4. Update pillow dependency 

    Not tested. Will archive repository soon.
    @sigurdga
    sigurdga committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    0f819ad View commit details
    Browse the repository at this point in the history
Loading