snipe 7255a8bb0c Merge remote-tracking branch 'origin/develop' into 2.0 ...

# Conflicts:
#	app/controllers/admin/AssetsController.php

2015-07-09 01:24:34 -07:00

..

account

Prevent changing user email/pass/groups if locked

2015-03-25 14:26:00 -07:00

admin

Merge remote-tracking branch 'origin/develop' into 2.0

2015-07-09 01:24:34 -07:00

.gitkeep

Initial laravel import

2013-11-13 01:59:39 -05:00

AdminController.php

Fixes #237 - reporting-only group

2014-11-04 18:21:10 -05:00

AuthController.php

Addresses #577 and fixes #165 - switch from email to username

2015-06-15 12:16:39 -07:00

AuthorizedController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

BaseController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

HomeController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00