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

# Conflicts:
#	.gitignore
#	app/config/version.php

2015-07-16 20:34:01 -07:00

..

commands

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

2015-07-16 20:34:01 -07:00

config

Part of #863 - adds order number to asset listing

2015-07-16 19:54:56 -07:00

controllers

Part of #863 - adds order number to asset listing

2015-07-16 19:54:56 -07:00

database

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

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

lang

Update for change to username on sign in

2015-07-16 10:04:20 +09:30

models

Fixes #909 - expired licenses showing in email report

2015-07-13 20:59:02 -07:00

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

Part of #863 - adds order number to asset listing

2015-07-16 19:54:56 -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

Merge pull request #907 from madd15/user-fileuploads

2015-07-13 09:22:39 -07:00

validators.php

Allow new Unicode character class to alpha_space

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