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

Dev #14

Merged
merged 19 commits into from
Dec 19, 2018
Merged

Dev #14

merged 19 commits into from
Dec 19, 2018

Commits on Dec 18, 2018

  1. Fix MenuComponent

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    ac77231 View commit details
    Browse the repository at this point in the history

  2. Исправлена выборка нужной языковой версии страницы на фронтенде.

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    ee714e2 View commit details
    Browse the repository at this point in the history

  3. Добавлена возможность добавления описаний для настроек модулей в адми… 

    …нке.
    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    22b71c3 View commit details
    Browse the repository at this point in the history

  4. - Удалена настройка stripTags в модуле комментариев; 

    - Убрана зависимость от настройки stripTags текста комментария;
- Добавлено описание настройки allowedTags.
    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    2983976 View commit details
    Browse the repository at this point in the history

  5. Update changelog

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    c0210ee View commit details
    Browse the repository at this point in the history

  6. Добавлен чекбокс "Выбрать все" при импорте правил в модуле RBAC.

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    60f3175 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2781 from kuzmina-mariya/fix/menu-component 

    Fix MenuComponent
    @dzhedai
    dzhedai authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    de473be View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2784 from kuzmina-mariya/features/rbac-import-add… 

    …-check-all-checkbox

Добавлен чекбокс "Выбрать все" при импорте правил в модуле RBAC.
    @dzhedai
    dzhedai authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    4042201 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2783 from kuzmina-mariya/fix/comments-corrections 

    #1942: Исправления в комментариях
    @dzhedai
    dzhedai authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    259b26c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into fix/select-page-lang-version

    @dzhedai
    dzhedai authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    e97b21e View commit details
    Browse the repository at this point in the history

  11. Merge pull request #2782 from kuzmina-mariya/fix/select-page-lang-ver… 

    …sion

#2658: Еще баг с переключением языков
    @dzhedai
    dzhedai authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    a31d0fc View commit details
    Browse the repository at this point in the history

  12. Запрет удаления способа доставки, имеющего связанные заказы.

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b5134ec View commit details
    Browse the repository at this point in the history

  13. Обработка ошибок в JS при ajax-удалении записи в CustomButtonColumn.

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    44173fc View commit details
    Browse the repository at this point in the history

  14. Merge pull request #2785 from kuzmina-mariya/fix/prevent-removal-deli… 

    …very-method-with-related-orders

#2678: Удаление способа доставки и заказы
    @koma136
    koma136 authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b15c474 View commit details
    Browse the repository at this point in the history

  15. Добавлена проверка значения количества товара (неотрицательное число)

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    dbcd142 View commit details
    Browse the repository at this point in the history

  16. Добавлен атрибут "Количество товара" (quantity) для вариантов товара

    @orioledev
    orioledev committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    2431abb View commit details
    Browse the repository at this point in the history

  17. Merge pull request #2786 from kuzmina-mariya/features/add-product-var… 

    …iant-quantity

Спасибо!
    @sabian
    sabian authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    26b4f6f View commit details
    Browse the repository at this point in the history

  18. #2703

    @koma136
    koma136 committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    3884731 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #2787 from koma136/dev 

    VK Отказ от версии по умолчанию #2703
    @koma136
    koma136 authored Dec 18, 2018
    Configuration menu
    Copy the full SHA
    de08066 View commit details
    Browse the repository at this point in the history