snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5 ...

# Conflicts:
#	app/views/backend/models/view.blade.php

2015-05-02 12:28:34 -07:00

..

commands

Fixed typo

2015-04-28 16:42:08 -07:00

config

Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5

2015-05-02 12:28:34 -07:00

controllers

Accessories Slack integration

2015-04-30 20:53:44 -07:00

database

Slack integration for asset checkin/checkout

2015-04-29 17:38:22 -07:00

lang

Updated language strings for slack

2015-04-29 18:01:43 -07:00

models

Fixes #766

2015-04-29 16:14:08 -07:00

private_uploads

Folder for private uploads

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

start

Set version config

2015-02-28 14:44:30 -08:00

storage

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09: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 branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5

2015-05-02 12:28:34 -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

Fixes #718 - uppercase state/country abbreviations

2015-04-01 15:31:53 -07:00

routes.php

Fixes for #766 - add activity report

2015-04-29 14:50:12 -07:00

validators.php

Allow new Unicode character class to alpha_space

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