snipe 3b359d7c6e Merge branch 'develop' of github.com:snipe/snipe-it into develop

2015-09-14 15:49:00 -07:00

..

commands

Fixed typo

2015-08-20 15:38:35 -07:00

config

Bumped version

2015-09-14 15:48:49 -07:00

controllers

Allow asset-level EOL to override model level if given

2015-09-14 15:48:42 -07:00

database

Added custom CSS field in settings

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

lang

Fixes #1167 - don't allow double checkin

2015-09-10 11:49:43 -07:00

models

Allow asset-level EOL to override model level if given

2015-09-14 15:48:42 -07:00

private_uploads

Folder for private uploads

2015-02-06 18:41:56 -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

Update checkin-asset.blade.php

2015-09-11 21:48:05 -05:00

filters.php

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

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

helpers.php

Fixes #1170 - barcode alternative

2015-09-11 16:13:44 -07:00

macros.php

Fixes #1170 - barcode alternative

2015-09-11 16:13:44 -07:00

routes.php

Added routes to LDAP

2015-08-13 13:20:30 -04:00

validators.php

Added custom CSS field in settings

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