snipe 390de7ae36 Merge remote-tracking branch 'origin/develop'

2016-05-16 21:55:19 -07:00

..

commands

Fix for missing company

2016-01-06 21:04:59 -08:00

config

Renamed doc files

2016-03-15 21:25:02 -07:00

controllers

Merge remote-tracking branch 'origin/develop'

2016-05-16 21:55:19 -07:00

database

Only import settings if there is a need to

2016-02-11 12:06:06 -08:00

lang

Updated language strings

2016-05-16 21:55:05 -07:00

models

Check for eol value or return false on eol_date()

2016-02-17 03:05:02 -08:00

private_uploads

Moved sample file so people can't accidentally import it

2015-11-02 16:44:46 -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

Merge branch 'develop' into custom_fields

2015-10-20 17:11:04 -07:00

views

Fixes #1634 - better handling for category listings that are not asset categories

2016-05-16 20:53:51 -07:00

filters.php

Remove signin message if form not submitted

2016-02-12 14:12:58 -08:00

helpers.php

Use helper for company selectlist, added missing language strings

2016-02-12 14:08:35 -08:00

macros.php

Fixes #1574 - added Chinese Yuan

2016-01-05 19:33:14 -08:00

routes.php

Fixes #1634 - better handling for category listings that are not asset categories

2016-05-16 20:53:51 -07:00

validators.php

Merge branch 'develop' into custom_fields

2015-10-20 17:11:04 -07:00