Brady Wetherington a67951fbce Merge branch 'develop' into custom_fields ...

Conflicts:
	app/controllers/admin/AssetsController.php
	app/views/backend/hardware/index.blade.php

2015-10-22 02:30:30 -07:00

..

account

Slack notification for requested assets

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

admin

Merge branch 'develop' into custom_fields

2015-10-22 02:30:30 -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

CustomFieldsController.php

Terribly rough Custom Fields creation

2015-10-22 00:38:07 -07:00

HomeController.php

Updated spacing for PSR-2

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