snipe 2f4e54c8a6 Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00

..

commands

Merge pull request #1516 from dmeltzer/develop

2015-12-22 13:32:24 -08:00

config

More LDAP login fixes

2015-12-30 14:53:49 -08:00

controllers

Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00

database

Add option to allow ignoring SSL Cert verification.

2015-12-24 02:17:06 -05:00

lang

Updated translations

2015-12-29 15:46:20 -08:00

models

Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -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

Added dashboard back as string

2015-12-30 12:57:49 -08:00

filters.php

Restrict backups to super users

2015-11-19 09:13:20 +03:00

helpers.php

Company helper, updated bulk view to show model number

2015-12-22 11:39:42 -08:00

macros.php

Fixes #1526

2015-12-29 19:32:15 -08:00

routes.php

Allow bulk model update for #1462, fixes #1442

2015-12-09 20:35:24 -08:00

validators.php

Merge branch 'develop' into custom_fields

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