snipe 183f8ae1bf Merge remote-tracking branch 'origin/develop' into 2.0 ...

# Conflicts:
#	app/commands/ImportCommand.php
#	app/lang/en/admin/users/message.php
#	app/lang/en/general.php

2015-08-04 12:51:35 -07:00

..

commands

Merge remote-tracking branch 'origin/develop' into 2.0

2015-08-04 12:51:35 -07:00

config

Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"

2015-07-20 17:12:28 -07:00

controllers

Fixes #1010 - better errors on large file uploads

2015-08-04 12:45:17 -07:00

database

Make thread_id default null

2015-08-03 12:35:54 -07:00

lang

Merge remote-tracking branch 'origin/develop' into 2.0

2015-08-04 12:51:35 -07:00

models

Added phpdocs to the model

2015-08-01 14:41:09 -04:00

private_uploads

Folder for private uploads

2015-02-06 18:41:56 -08:00

start

Added ThreadAssetLogs to the available artisan commands

2015-08-01 12:20:48 -04:00

storage

Ignore SQL dumps

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

tests

A0.4.3 add asset, license, user, model clone and artisan db migration

2014-08-12 17:25:07 +09:00

views

Merge remote-tracking branch 'origin/develop' into 2.0

2015-08-04 12:51:35 -07:00

filters.php

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

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

helpers.php

Newline

2014-08-15 19:46:10 -04:00

macros.php

Update macros.php

2015-07-29 14:23:17 -04:00

routes.php

Finished building out the report, and refactoring to make the code more expressive

2015-08-01 12:20:49 -04:00

validators.php

Fixes #941 - looser restrictions on alpha_space custom validator

2015-07-24 17:29:47 -07:00