Walter 6b26640077 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings

2015-11-22 11:01:07 -05:00

..

commands

Set default to not seed DB

2015-11-17 10:12:26 -05:00

config

Fixes #1362 - status labels losing type on edit

2015-11-20 09:20:14 -08:00

controllers

syntax error

2015-11-18 16:36:02 -05:00

database

added Crypt class and set ldap_pword field to longText

2015-11-17 15:20:55 -05:00

lang

begin work on idap import button

2015-11-18 12:11:42 -05:00

models

Fixed dumb indenting

2015-11-03 23:58:12 -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

Placeholder phpunit test

2015-08-13 00:26:26 -07:00

views

Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings

2015-11-22 11:01:07 -05:00

filters.php

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

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

helpers.php

Include default text in status label helper

2015-11-07 15:39:03 -08:00

macros.php

Updated currency array

2015-11-03 22:49:34 -08:00

routes.php

working on ldap import button

2015-11-18 16:22:04 -05:00

validators.php

Added custom CSS field in settings

2015-09-09 13:17:36 -07:00