snipe 5ff75e7f42 Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop ...

# Conflicts:
#	app/controllers/admin/CategoriesController.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/categories/index.blade.php
#	app/views/backend/settings/edit.blade.php

2015-10-21 23:06:43 -07:00

..

account

Slack notification for requested assets

2015-08-19 17:51:35 -07:00

admin

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -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

Changing the comparison to not care about type allows for auth to fail when no user is found in the LDAP directory.

2015-10-21 19:17:55 -05: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