Permalink
Commits on Jun 9, 2015
  1. Merge pull request #1773 from digicase/issues/1772/productselect_widg…

    …et_select2_css_class
    
    Fix CSS classes for ProductSelect widgets
    mvantellingen committed Jun 9, 2015
  2. Merge pull request #1774 from digicase/issues/1754/dashboard_prmotion…

    …s_views_fields
    
    Add required fields attributes
    mvantellingen committed Jun 9, 2015
  3. Add required fields attributes

    Some dashboard.promotions views were missing a fields attribute. For Django 1.8 compatibilty.
    digicase committed Jun 9, 2015
  4. Fix CSS classes for ProductSelect widgets

    ProductSelect widgets in the Dashboard require at least the CSS class `select2`. Django widget tweaks was overriding CSS classes set in the RemoteSelect and MultipleRemoteSelect widgets.
    digicase committed Jun 9, 2015
Commits on Jun 8, 2015
  1. Merge pull request #1771 from sasha0/issue/1747/stock_alert_date_closed

    setting date_closed on closing StockAlert, added additional check in …
    mvantellingen committed Jun 8, 2015
Commits on Jun 5, 2015
  1. Merge pull request #1761 from mostafa-anm/update-customising-docs

    Fix #1760 -- Update customising oscar docs
    codeinthehole committed Jun 5, 2015
  2. Merge pull request #1752 from john-parton/issue/1751_product_attribut…

    …e_value_set_unicode_value
    
    Easy: ProductAttributeValue._set_value use six.string_types instead of str.
    monikasulik committed Jun 5, 2015
Commits on Jun 4, 2015
  1. Merge pull request #1770 from adamend/fix-basketview

    Fix call to calculate_excl_discount
    maikhoepfel committed Jun 4, 2015
  2. Fix PEP8 issues

    maikhoepfel committed Jun 4, 2015
  3. Fix call to calculate_excl_discount.

    It was being passed a shipping charge, when it wants a basket.
    adamend committed Jun 4, 2015
  4. Change allowed line length to 99 chars

    The impromptu DjangoCon gathering decided it's a good idea.
    maikhoepfel committed Jun 4, 2015
  5. Finalise release notes

    maikhoepfel committed Jun 4, 2015
  6. Make Partner.name form field required

    This is part of addressing #1723. Partner.name is optional. But when we
    create a partner through the dashboard, it doesn't make sense to not set
    a name. Hence this commit enforces it at the form level.
    
    Closes #1723.
    maikhoepfel committed Jun 4, 2015
  7. Merge pull request #1768 from django-oscar/issue/1653

    Forbid hyphens in CommunicationEventType code field
    codeinthehole committed Jun 4, 2015
  8. Merge pull request #1766 from monikasulik/bugfix/1765_basket_message_bug

    Fix validation message in basket
    maikhoepfel committed Jun 4, 2015
  9. Merge pull request #1763 from monikasulik/bugfix/1654_basket_issue

    Improve basket validation message
    maikhoepfel committed Jun 4, 2015
  10. Fix validation message in basket

    Fixes stockrecord availability validation message in the case when stock is lower than allocation. Previously the message that appeared contained negative numbers. For example: "a maximum of -1 can be bought". Now it will display: "no stock available"
    Monika Sulik committed Jun 4, 2015
  11. Merge pull request #1764 from django-oscar/issue/1728

    Add migrations required for Django 1.8
    codeinthehole committed Jun 4, 2015
  12. Fix pep8 issue

    Monika Sulik committed Jun 4, 2015
  13. Set EmailFields to have max_length=75 to side-step migration problem

    When the lowest version of Django we support is 1.8, we can remove these
    max_lengths and fall back to the length set in Django (now 254). It's
    messy to try and support both Django 1.7 and 1.8 with this change as
    'makemigrations' will pick up different things depending on which
    version of Django is being used.
    codeinthehole committed Jun 4, 2015
  14. Merge branch 'master' into bugfix/1654_basket_issue

    Monika Sulik committed Jun 4, 2015