Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

[WIP] Feature: Warning system for #47 #268

Merged
merged 11 commits into from
Nov 26, 2016
Merged

[WIP] Feature: Warning system for #47 #268

merged 11 commits into from
Nov 26, 2016

Commits on Sep 1, 2016

  1. follow style guide

    @Matslom
    Matslom committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    ce5ac6c View commit details
    Browse the repository at this point in the history

  2. revert earlier changes

    @Matslom
    Matslom committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    5db1558 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2016

  1. Start working with warning system

    @Matslom
    Matslom committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    325c906 View commit details
    Browse the repository at this point in the history

  2. Merged master into warning-system

    @Matslom
    Matslom committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    8ec6e51 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/warning-system' 

    Conflicts:
	app/Presenters/UserPresenter.php
	app/Providers/AppServiceProvider.php
	resources/views/layouts/admin.twig
    @Matslom
    Matslom committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    a9a880b View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2016

  1. Fix code style

    @Matslom
    Matslom committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    a9d8a29 View commit details
    Browse the repository at this point in the history

  2. Add revoke warn ability

    @Matslom
    Matslom committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    f020aa2 View commit details
    Browse the repository at this point in the history

  3. Fix style2

    @Matslom
    Matslom committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    e403d44 View commit details
    Browse the repository at this point in the history

  4. Improve admin panel views

    @Matslom
    Matslom committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    8c49e15 View commit details
    Browse the repository at this point in the history

  5. Remove unnecessary stuff

    @Matslom
    Matslom committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    01d818d View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2016

  1. Add acknowledge with warn

    @Matslom
    Matslom committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    b065777 View commit details
    Browse the repository at this point in the history