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

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

2015-11-25 14:22:22 -08:00

..

account

Use global scope for companyable children

2015-11-19 08:42:17 +03:00

admin

Merge branch 'develop' into custom_fields

2015-11-25 14:22:22 -08:00

.gitkeep

Initial laravel import

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

AdminController.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

AuthController.php

Removed escaping, add sometimes required, add encrypt ldap password

2015-11-17 13:49:59 -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