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

Last changes including significant aesthetic changes #146

Merged
merged 23 commits into from
Oct 31, 2016
Merged

Last changes including significant aesthetic changes #146

merged 23 commits into from
Oct 31, 2016

Commits on Aug 3, 2016

  1. W.I.P various improvements

    @tony-gaia
    tony-gaia committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    907d2e1 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. Merge branch 'master' into aesthetic_changes 

    Conflicts:

wildlifelicensing/apps/applications/templates/wl/entry/select_licence_type.html
	wildlifelicensing/static/wl/css/base.css
    @tony-gaia
    tony-gaia committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    8d2ddf5 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. Added new-look intro section for entry pages.

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

Commits on Oct 24, 2016

  1. Merge branch 'master' into aesthetic_changes 

    Conflicts:

wildlifelicensing/apps/applications/templates/wl/entry/select_licence_type.html
	wildlifelicensing/static/wl/css/base.css

Also updated look of banner and added banner to returns.
    @tony-gaia
    tony-gaia committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    d953ae9 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. Used new intro template in all application pages, changed application… 

    ….css to applications.css
    @tony-gaia
    tony-gaia committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    366a269 View commit details
    Browse the repository at this point in the history

  2. Removed unnecessary space

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

  3. Merge branch 'master' into aesthetic_changes 

    Conflicts:
	wildlifelicensing/apps/returns/templates/wl/enter_return.html

Changed text on customer dashboard and select licence type pages.
    @tony-gaia
    tony-gaia committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    148f9b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. Merge branch 'master' into aesthetic_changes

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

  2. Added price label to licence types and variants.

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

  3. Merge branch 'master' into aesthetic_changes

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

  4. Added meta header to turn off the telephone number detection for W11/… 

    …Edge. This feature was turning application/licence number into phone number (link).
    @serge-gaia
    serge-gaia committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    47d5b78 View commit details
    Browse the repository at this point in the history

  5. Added comment for the phone number meta header.

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

  6. Merge branch 'master' into disable_phone_detection_windows

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

  7. Merge pull request #127 from gaiaresources/disable_phone_detection_wi… 

    …ndows

Added meta header to turn off the telephone number detection for W11/…
    @tony-gaia
    tony-gaia committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    14d827e View commit details
    Browse the repository at this point in the history

  8. Changed intro section appearance and customer dashboard text.

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

  9. Basic auth test for reports

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

Commits on Oct 27, 2016

  1. Changed product code from slug-field to charfield

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

  2. Merge branch 'master' into aesthetic_changes

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

  3. Merge pull request #128 from gaiaresources/product_code_slug_change 

    Changed product code from slug-field to charfield
    @serge-gaia
    serge-gaia committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    ebd8e17 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into add_tests

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

  5. Merge pull request #129 from gaiaresources/add_tests 

    Add tests
    @tony-gaia
    tony-gaia committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    56fb6fc View commit details
    Browse the repository at this point in the history

  6. Numerous fixes 

    Put in mixins for amend / renew licences

Moved extracted application field inputs to top of issue licence form

Credid card payment only processed when issue licence form is valid.

Temporary applications are removed in dashboard view.

Fixed licence expired status (wasn't showing before)

Added (Nil) suffix to status for submitted nil returns.

Reinstated status in officer's licence table.

Fixed actions in officer's licence table for when can't
amend/renew/reissue.

Removed current/future returns for previous licence when issuing amended
licence.

Can now properly curate Nil returns.
    @tony-gaia
    tony-gaia committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    e9d5247 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2016

  1. Merge pull request #130 from gaiaresources/aesthetic_changes 

    Aesthetic changes and bug fixes
    @serge-gaia
    serge-gaia committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    52517b4 View commit details
    Browse the repository at this point in the history