Commit Graph

3272 Commits

Author SHA1 Message Date
snipe 1908499379 Fixes #1626 - correctly show deleted models 2016-01-13 07:34:02 -08:00
snipe 348c8f62d1 Fixes #1610 - hide license keys if user doesn't have permission 2016-01-13 07:04:45 -08:00
snipe 7da0ffc325 Fixes #1623 - disallow admins to edit permissions on users 2016-01-13 06:51:56 -08:00
snipe 33b05b071d Shitty, hacky workaround for getting password managers to leave the form fields alone 2016-01-13 06:12:46 -08:00
snipe f98b4095a2 Better explanation of roles 2016-01-13 04:52:26 -08:00
snipe b30edfd9d6 Use locations dropdown 2016-01-13 04:50:55 -08:00
snipe b16ea61da8 Added license_keys as permission 2016-01-13 04:39:26 -08:00
snipe a5e2e7e285 Removed date field until I have time to handle this more efficiently 2016-01-13 04:11:23 -08:00
snipe 456e586e02 Bumped version 2016-01-13 03:58:08 -08:00
snipe 4c4e0ce5c5 Get assetlog with user 2016-01-13 03:58:01 -08:00
snipe 8ea23e6773 Hide extra fields by default (or else endless scrolling) 2016-01-13 03:57:28 -08:00
snipe c9feff0757 Fixes #1580 - license showing as asset in profile view 2016-01-13 03:56:28 -08:00
snipe f1b2ba5c51 Additional comments 2016-01-13 03:56:05 -08:00
snipe 76220b7884 Fixes #1601 - bulk update now honors un-requestable 2016-01-12 20:00:51 -08:00
snipe bb88b85a02 Removed erroneous blade that led to confusing UX 2016-01-11 18:48:49 -08:00
snipe dad816ba25 Removed debugging echo 2016-01-11 18:48:33 -08:00
snipe 4037200fad Additional fields for user import 2016-01-11 18:39:40 -08:00
snipe 326d0cc764 Bumped version 2016-01-11 18:17:01 -08:00
snipe 9800786485 Fixes #1597 and allows non-numeric employee number 2016-01-11 18:16:52 -08:00
snipe ce6b2f2e5f Merge pull request #1598 from ddreier/1597-ldap-email
Updated the LDAP import to get the correct email field setting.
2016-01-07 08:14:57 -08:00
Daniel Dreier 3e2fc13af5 Updated the LDAP import to get the correct email field setting. 2016-01-07 10:03:42 -06:00
snipe 73317f14a0 Bumped version 2016-01-06 21:05:11 -08:00
snipe 6bc2af6e71 Fix for missing company 2016-01-06 21:04:59 -08:00
snipe 962e7531a6 Fix for changing asset model from model with custom fields to one without 2016-01-06 18:04:55 -08:00
snipe e8e8e8f4f3 Bugfix for importer not recognizing existing entries with quotes 2016-01-06 16:21:10 -08:00
snipe 218fe72e16 Fixes #1500: Use the currency setting rather than the localization label 2016-01-05 19:45:40 -08:00
snipe 2b13641661 Fixes #1574 - added Chinese Yuan 2016-01-05 19:33:14 -08:00
snipe 66fe626d51 Fixes #1560 - added AED 2016-01-05 19:31:46 -08:00
snipe ca9ab681b9 Update url for #1566 2016-01-05 19:26:37 -08:00
snipe 0f07f12d35 Merge pull request #1582 from merid14/patch-1
Patch for #1561
2016-01-05 15:16:48 -07:00
snipe 03efe0b3e2 Merge pull request #1585 from snipe/null_custom_fieldset_ok
Allow setting 'no custom fields' from having a customfieldset enabled
2016-01-05 14:56:58 -07:00
Brady Wetherington d7b91d88d6 Allow setting 'no custom fields' from having a customfieldset enabled
in a model.
2016-01-05 13:53:09 -08:00
snipe 298a938db2 Fix for company scoping bug 2016-01-05 13:20:49 -08:00
snipe 6c389298f8 Suppress errors when the file doesn't exist 2016-01-05 13:20:38 -08:00
snipe d4685ec037 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-01-05 13:12:57 -08:00
snipe 602501b4a3 Bumped version 2016-01-05 13:12:14 -08:00
snipe e93aebc27b Make first user a super admin 2016-01-05 13:09:55 -08:00
Brady Wetherington e392c87250 Experimental fix for Company scope issue. 2016-01-05 13:08:14 -08:00
Walter 2707742518 Patch for #1561
Added -p back to the db setup to provide password input. #1561
2016-01-05 09:16:59 -05:00
snipe 738dc1fdf0 Bumped version to 2.1.0-pre 2015-12-30 17:08:34 -08:00
snipe 6f04cf9f61 Merge pull request #1554 from snipe/final_custom_fields_tweaks
Final custom fields tweaks
v2.1.0-pre
2015-12-30 16:32:16 -08:00
Brady Wetherington 4be3f2700c Make this migration run correctly in the past, before the schema has been changed 2015-12-30 16:23:13 -08:00
Brady Wetherington 4cb0e40abb Eager-Load CustomFieldsets and CustomFields with relations 2015-12-30 16:08:40 -08:00
Brady Wetherington ad144e127c Pertains to one of the elements in #1397 - timestamps and user_id's for Custom Fields 2015-12-30 15:58:51 -08:00
snipe 2f4e54c8a6 Merge remote-tracking branch 'origin/develop' 2015-12-30 15:47:00 -08:00
snipe 7c06cba647 More LDAP login fixes 2015-12-30 14:53:49 -08:00
snipe 5eb506b9c3 Bumped version 2015-12-30 12:57:55 -08:00
snipe 4aa376826f Added dashboard back as string 2015-12-30 12:57:49 -08:00
snipe 1d9e014bfa More auth tweaks :( 2015-12-30 12:57:41 -08:00
snipe 506af72d83 Superadmin check in bulk delete users 2015-12-29 20:03:08 -08:00