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

Develop #815

Merged
merged 9 commits into from
Aug 1, 2016
Merged

Develop #815

merged 9 commits into from
Aug 1, 2016

Commits on Dec 29, 2015

  1. Merge pull request #6 from panique/master 

    Uptade from head fork
    @slaveek
    slaveek committed Dec 29, 2015
    Configuration menu
    Copy the full SHA
    8ac86c6 View commit details
    Browse the repository at this point in the history

  2. Added public keyword to constructor.

    Slaveek committed Dec 29, 2015
    Configuration menu
    Copy the full SHA
    81adb24 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2015

  1. Converted indentation to spaces in application/config files

    Slaveek committed Dec 30, 2015
    Configuration menu
    Copy the full SHA
    d5dde95 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2015

  1. Converted indentation to spaces in AdminController

    Slaveek committed Dec 31, 2015
    Configuration menu
    Copy the full SHA
    8fcb01b View commit details
    Browse the repository at this point in the history

  2. Converted indentation to spaces in application/core files 

    Also added separate line between comments and code, fixed opening
bracket in method (move to the new line), remove white spaces
    Slaveek committed Dec 31, 2015
    Configuration menu
    Copy the full SHA
    7d7c394 View commit details
    Browse the repository at this point in the history

  3. Converted indentation to spaces in application/model files 

    Also added separate line between comments and code, fixed opening
brackets in method (moved to the new line), removed white spaces, added
new line at the end of the file.
    Slaveek committed Dec 31, 2015
    Configuration menu
    Copy the full SHA
    4eb85f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2016

  1. Merge pull request #772 from slaveek/psr2-fix 

    Fit to PSR-2: Coding Style
    @panique
    panique committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    2698846 View commit details
    Browse the repository at this point in the history

  2. merge fix and additional comments for PR 773, generates and absolute … 

    …redirect path for usage inside subfolder installations #773
    Chris committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    7575c66 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2016

  1. Fix for missing code (my fault :)) in PR 773, Ticket #770: redirect a… 

    …fter failed login works now correctly
    Chris committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    594f016 View commit details
    Browse the repository at this point in the history