Abdullah Alansari d8df61bd32 Merge remote-tracking branch 'upstream/develop' into multiple-companies ...

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

2015-11-12 09:30:11 +03:00

..

commands

Add password confirmation, hide password and set default database seed to no

2015-11-07 22:21:07 -05:00

config

Link to category listing from accessories

2015-11-11 17:43:24 -08:00

controllers

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

database

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

lang

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

models

Add initial support for multiple companies

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

private_uploads

Moved sample file so people can't accidentally import it

2015-11-02 16:44:46 -08:00

start

License importer, small tweaks to asset importer

2015-08-14 14:08:34 -07:00

storage

Ignore SQL dumps

2015-06-19 17:31:51 -07:00

tests

Placeholder phpunit test

2015-08-13 00:26:26 -07:00

views

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

filters.php

Resolves #478 - redirects non-reporting users to view assets page

2015-02-04 09:31:01 -08:00

helpers.php

Include default text in status label helper

2015-11-07 15:39:03 -08:00

macros.php

Updated currency array

2015-11-03 22:49:34 -08:00

routes.php

Add initial support for multiple companies

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

validators.php

Added custom CSS field in settings

2015-09-09 13:17:36 -07:00