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

Fixes #138

Merged
merged 29 commits into from
Oct 14, 2016
Merged

Fixes #138

merged 29 commits into from
Oct 14, 2016

Commits on Sep 7, 2016

  1. Put in happy path unit tests for returns.

    @tony-gaia
    tony-gaia committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    628b261 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #109 from gaiaresources/returns_unit_tests 

    Put in happy path unit tests for returns.
    @tony-gaia
    tony-gaia committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    91e422b View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	wildlifelicensing/apps/main/tests/helpers.py
    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    7776bdb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	wildlifelicensing/apps/main/tests/helpers.py
    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    a33a711 View commit details
    Browse the repository at this point in the history

  3. Added Gaia JSON editor widget

    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    25edf19 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 1913-vairiant-bug 

    Conflicts:
	requirements.txt
    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    2a0355b View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into fixes_after_merge

    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    7efef0d View commit details
    Browse the repository at this point in the history

  6. * host_resolve. Since there's no django-host anymore, implemented the… 

    … host_resolve by setting a DEFAULT_HOST in env that should be the URL (with schem and port) of the running server.

* fixed a warning in url patterns.
    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    efa8218 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/master'

    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    31a2672 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into fix_host_resolve

    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    bf4ea47 View commit details
    Browse the repository at this point in the history

  9. Added validation function on variant group admin to ensure there are … 

    …oscar products for any new variants added.
    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    7d3fa6f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into 1913-variant-bug

    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    4c3d546 View commit details
    Browse the repository at this point in the history

  11. Removed Robs jsoneditor because it needs to go in gaia devs repo.

    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    1a4338a View commit details
    Browse the repository at this point in the history

  12. Removed unnecessary saves.

    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    34949e6 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #111 from gaiaresources/fix_host_resolve 

    Fix host resolve
    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    55b50ec View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into 1913-variant-bug

    @tony-gaia
    tony-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    b7f2ca5 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #110 from gaiaresources/1913-variant-bug 

    1913 variant bug
    @serge-gaia
    serge-gaia committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    8350a9a View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2016

  1. Replaced all occurrence of 'basestring' by six.string_type.

    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    51da33a View commit details
    Browse the repository at this point in the history

  2. Removed a settings for travis.

    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    89c5e8e View commit details
    Browse the repository at this point in the history

  3. Fixed issue when creating/editing profile: the AddressForm needs a us… 

    …er as args.
    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    90c932c View commit details
    Browse the repository at this point in the history

  4. Added renewal_sent flag to renewals 

    Flag is set to true when either an email has been sent for a renewal
reminder or a renewal pdf has been created for a licence.

Renewals aren't sent for licences that have been amended / renewed
already.

A re-issue of a licence will set the flag to back to false allowing
renewal reminders to be sent for reissued licences.

Changed licences 'previous_licence' flag, which wasn't being used
(except for being shown in reports, which would always be empty) to
'replaced_by', which is used as part of the condition as to whether to
send renewal reminders.

Moved renewal reminder cron job and email code out of applications app
into main, where they are more relevant.
    @tony-gaia
    tony-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    17226c3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #113 from gaiaresources/fix_profile_create 

    Fix profile create
    @tony-gaia
    tony-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    ac23b87 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #112 from gaiaresources/1845-renewal-sent-flag 

    Added renewal_sent flag to licences
    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    5126e74 View commit details
    Browse the repository at this point in the history

  7. Licence emails were sent twice.

    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    a69e79a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #114 from gaiaresources/fix-email_cc 

    Licence emails were sent twice.
    @tony-gaia
    tony-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    c406235 View commit details
    Browse the repository at this point in the history

  9. Set the default DEFAULT_HOST to be the production one.

    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    d0e9a03 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/master'

    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    1ad5855 View commit details
    Browse the repository at this point in the history

  11. Fix some py3 compatibilities. Enough to pass the tests

    @serge-gaia
    serge-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    86cebef View commit details
    Browse the repository at this point in the history

  12. Merge pull request #115 from gaiaresources/test_py3 

    Fix some py3 compatibilities. Enough to pass the tests
    @tony-gaia
    tony-gaia committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    1821786 View commit details
    Browse the repository at this point in the history