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

# Conflicts:
#	app/controllers/admin/AssetsController.php

2015-07-24 15:56:10 -07:00

..

commands

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

2015-07-24 15:56:10 -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

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

2015-07-24 15:56:10 -07:00

database

Add Checkin_email to Catergories Table

2015-07-24 10:20:50 +09:30

lang

Add checkin_email Lang

2015-07-24 10:25:52 +09:30

models

Add checkin_email()

2015-07-24 12:01:21 +09:30

private_uploads

Folder for private uploads

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

start

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

2015-07-08 18:07:53 -07: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 pull request #951 from madd15/fixes-1

2015-07-24 15:12:04 -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

Migration for location-specific currency, updated views for #819

2015-07-08 20:35:40 -07:00

routes.php

Fixed all issues that were reported by @leobg

2015-07-20 21:34:19 -04:00

validators.php

Allow new Unicode character class to alpha_space

2015-03-09 21:29:27 -07:00