Commit Graph

  • 2d56240408 Inline styles to show that the email, username field are editable snipe 2016-01-27 17:04:16 -08:00
  • 00bb511506 Bumped version snipe 2016-01-27 14:39:18 -08:00
  • fb1dd29059 Fix for custom fields error if creating asset from asset model page snipe 2016-01-27 14:39:00 -08:00
  • 0896ca6517 Fixes #1670 - first name validates for one letter snipe 2016-01-22 10:40:16 -08:00
  • 9a84497fb0 Updated changelog v2.1.0 snipe 2016-01-21 19:37:30 -08:00
  • e4cb237bfe Updated version for 2.1.0 snipe 2016-01-21 18:12:05 -08:00
  • 28b89f3ddb Use location list helper for dropdown snipe 2016-01-15 15:21:34 -08:00
  • 9ad9e1d5a5 Fixes #1566 - use config url for upload images snipe 2016-01-15 15:21:19 -08:00
  • 39f40a3f6d Bumped version snipe 2016-01-13 18:00:11 -08:00
  • 0d3a4813ce Fixes #1631 - delete image on asset edit snipe 2016-01-13 18:00:06 -08:00
  • 51e480661d Fixes uploads directory for sub-dirctories snipe 2016-01-13 17:59:48 -08:00
  • 77632cdfb0 Allow optional status change on checkin snipe 2016-01-13 08:04:52 -08:00
  • 19d6f33770 RTD does NOT mean "Retired" - It means Ready to Deploy. snipe 2016-01-13 07:51:40 -08:00
  • c779034e41 Better fix for model uniqueness snipe 2016-01-13 07:44:00 -08:00
  • 8ff7a6ce21 Fixes #1572 - remove unique constraint for models snipe 2016-01-13 07:41:11 -08:00
  • 1908499379 Fixes #1626 - correctly show deleted models snipe 2016-01-13 07:34:02 -08:00
  • 348c8f62d1 Fixes #1610 - hide license keys if user doesn't have permission snipe 2016-01-13 07:04:45 -08:00
  • 7da0ffc325 Fixes #1623 - disallow admins to edit permissions on users snipe 2016-01-13 06:51:56 -08:00
  • 33b05b071d Shitty, hacky workaround for getting password managers to leave the form fields alone snipe 2016-01-13 06:12:46 -08:00
  • f98b4095a2 Better explanation of roles snipe 2016-01-13 04:52:26 -08:00
  • b30edfd9d6 Use locations dropdown snipe 2016-01-13 04:50:55 -08:00
  • b16ea61da8 Added license_keys as permission snipe 2016-01-13 04:39:26 -08:00
  • a5e2e7e285 Removed date field until I have time to handle this more efficiently snipe 2016-01-13 04:11:23 -08:00
  • 456e586e02 Bumped version snipe 2016-01-13 03:58:08 -08:00
  • 4c4e0ce5c5 Get assetlog with user snipe 2016-01-13 03:58:01 -08:00
  • 8ea23e6773 Hide extra fields by default (or else endless scrolling) snipe 2016-01-13 03:57:28 -08:00
  • c9feff0757 Fixes #1580 - license showing as asset in profile view snipe 2016-01-13 03:56:28 -08:00
  • f1b2ba5c51 Additional comments snipe 2016-01-13 03:56:05 -08:00
  • 76220b7884 Fixes #1601 - bulk update now honors un-requestable snipe 2016-01-12 20:00:51 -08:00
  • bb88b85a02 Removed erroneous blade that led to confusing UX snipe 2016-01-11 18:48:49 -08:00
  • dad816ba25 Removed debugging echo snipe 2016-01-11 18:48:33 -08:00
  • 4037200fad Additional fields for user import snipe 2016-01-11 18:39:40 -08:00
  • 326d0cc764 Bumped version snipe 2016-01-11 18:17:01 -08:00
  • 9800786485 Fixes #1597 and allows non-numeric employee number snipe 2016-01-11 18:16:52 -08:00
  • ce6b2f2e5f Merge pull request #1598 from ddreier/1597-ldap-email snipe 2016-01-07 08:14:57 -08:00
  • 3e2fc13af5 Updated the LDAP import to get the correct email field setting. Daniel Dreier 2016-01-07 10:03:42 -06:00
  • 73317f14a0 Bumped version snipe 2016-01-06 21:05:11 -08:00
  • 6bc2af6e71 Fix for missing company snipe 2016-01-06 21:04:59 -08:00
  • 962e7531a6 Fix for changing asset model from model with custom fields to one without snipe 2016-01-06 18:04:55 -08:00
  • e8e8e8f4f3 Bugfix for importer not recognizing existing entries with quotes snipe 2016-01-06 16:21:10 -08:00
  • 2982cffc3a Showing our love to Debian & resolving conflict mtucker6784 2016-01-06 07:20:38 -07:00
  • 218fe72e16 Fixes #1500: Use the currency setting rather than the localization label snipe 2016-01-05 19:45:40 -08:00
  • 2b13641661 Fixes #1574 - added Chinese Yuan snipe 2016-01-05 19:33:14 -08:00
  • 66fe626d51 Fixes #1560 - added AED snipe 2016-01-05 19:31:46 -08:00
  • ca9ab681b9 Update url for #1566 snipe 2016-01-05 19:26:37 -08:00
  • 0f07f12d35 Merge pull request #1582 from merid14/patch-1 snipe 2016-01-05 15:16:48 -07:00
  • 03efe0b3e2 Merge pull request #1585 from snipe/null_custom_fieldset_ok snipe 2016-01-05 14:56:58 -07:00
  • d7b91d88d6 Allow setting 'no custom fields' from having a customfieldset enabled in a model. Brady Wetherington 2016-01-05 13:53:09 -08:00
  • 298a938db2 Fix for company scoping bug snipe 2016-01-05 13:20:49 -08:00
  • 6c389298f8 Suppress errors when the file doesn't exist snipe 2016-01-05 13:20:38 -08:00
  • d4685ec037 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-01-05 13:12:57 -08:00
  • 602501b4a3 Bumped version snipe 2016-01-05 13:12:14 -08:00
  • e93aebc27b Make first user a super admin snipe 2016-01-05 13:09:55 -08:00
  • e392c87250 Experimental fix for Company scope issue. Brady Wetherington 2016-01-05 13:08:14 -08:00
  • 2707742518 Patch for #1561 Walter 2016-01-05 09:16:59 -05:00
  • 738dc1fdf0 Bumped version to 2.1.0-pre snipe 2015-12-30 17:08:34 -08:00
  • 6f04cf9f61 Merge pull request #1554 from snipe/final_custom_fields_tweaks v2.1.0-pre snipe 2015-12-30 16:32:16 -08:00
  • 4be3f2700c Make this migration run correctly in the past, before the schema has been changed Brady Wetherington 2015-12-30 16:23:13 -08:00
  • 4cb0e40abb Eager-Load CustomFieldsets and CustomFields with relations Brady Wetherington 2015-12-30 16:08:40 -08:00
  • ad144e127c Pertains to one of the elements in #1397 - timestamps and user_id's for Custom Fields Brady Wetherington 2015-12-30 15:58:51 -08:00
  • 2f4e54c8a6 Merge remote-tracking branch 'origin/develop' snipe 2015-12-30 15:47:00 -08:00
  • 7c06cba647 More LDAP login fixes snipe 2015-12-30 14:53:49 -08:00
  • 5eb506b9c3 Bumped version snipe 2015-12-30 12:57:55 -08:00
  • 4aa376826f Added dashboard back as string snipe 2015-12-30 12:57:49 -08:00
  • 1d9e014bfa More auth tweaks :( snipe 2015-12-30 12:57:41 -08:00
  • 506af72d83 Superadmin check in bulk delete users snipe 2015-12-29 20:03:08 -08:00
  • 1ce205a579 Fixes #1502 - load tableexport and jquery base64 locally snipe 2015-12-29 19:45:46 -08:00
  • a7a82e5fbc Fixes #1541 snipe 2015-12-29 19:41:50 -08:00
  • 23da312fff Put deleted_at back in users collection for restore functionality snipe 2015-12-29 19:35:31 -08:00
  • faf2e464fa Fixes #1526 snipe 2015-12-29 19:32:15 -08:00
  • 79c5d3f7d6 Fixes #1537 and #1524 snipe 2015-12-29 19:21:54 -08:00
  • 2888103d1a More updates for #1433 snipe 2015-12-29 19:12:22 -08:00
  • f89176d500 WTF I don't even. snipe 2015-12-29 18:48:06 -08:00
  • 5eb95272ee Merge pull request #1546 from snipe/docker_fix_2 snipe 2015-12-29 16:46:14 -08:00
  • 6c7e265921 Enable/Disable SSL based on existence of SSL cert data Brady Wetherington 2015-12-29 16:41:54 -08:00
  • 76955ec064 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-12-29 15:46:52 -08:00
  • de9a15a33b Bumped version snipe 2015-12-29 15:46:37 -08:00
  • f9cf2b2558 Updated translations snipe 2015-12-29 15:46:20 -08:00
  • e4627cee96 Updated language snipe 2015-12-29 15:41:18 -08:00
  • 36eb51d6e4 Fixed typo in string snipe 2015-12-29 15:41:05 -08:00
  • 689832036e Merge pull request #1517 from dmeltzer/for-asset-maintence-and-consum snipe 2015-12-29 15:10:14 -08:00
  • 8cfcb2aed8 Merge pull request #1544 from snipe/docker_fix_2 snipe 2015-12-29 15:08:59 -08:00
  • 27962d5439 Merge branch 'develop' into docker_fix_2 Brady Wetherington 2015-12-29 12:36:45 -08:00
  • f4af607d1a Point instead to the formal documentation, instead of having it here. Brady Wetherington 2015-12-29 12:35:14 -08:00
  • 90340a7111 Merge pull request #1535 from dmeltzer/fix-1531-proper snipe 2015-12-29 11:38:07 -08:00
  • 8742bf26b4 Merge pull request #1521 from twistedR/enhancement/ldap-self-signed-cert-support snipe 2015-12-29 11:34:07 -08:00
  • 8eb31a9a82 Merge pull request #1523 from thehereward/fix-up-some-php-docs snipe 2015-12-29 11:32:50 -08:00
  • aeeb273d4c Merge pull request #1423 from thehereward/develop snipe 2015-12-29 10:15:36 -08:00
  • 5f6ba2a148 Clear the expected checkin and last checkout dates when checking an item back in. Fixes #1531 Daniel Meltzer 2015-12-28 12:41:24 -05:00
  • 0cb3a9265e Fix PHPDocs that contained incorrect params tags. Hereward Mills 2015-12-24 11:20:05 +00:00
  • 96a5f437f2 Add option to allow ignoring SSL Cert verification. Raveesh 2015-12-24 02:15:30 -05:00
  • 4b92cdf684 Use the same values/calculations in the view as the index. Should fix #1140 I believe Daniel Meltzer 2015-12-24 01:31:49 +00:00
  • 50be3eed4a Fix Two issues with Asset Maintenance. Daniel Meltzer 2015-12-24 00:58:56 +00:00
  • 3b7da8f379 Fix consumable count in categories. This adds new methods to Category, consumables consumablesCount and a generic count. It also refactors CatgoriesController to use the count method rather than having it determine the category type. Daniel Meltzer 2015-12-23 12:55:30 -05:00
  • 90b00b02cc Merge pull request #1516 from dmeltzer/develop snipe 2015-12-22 13:32:24 -08:00
  • 9eee73d2e5 I accidentallyied a bracket. Daniel Meltzer 2015-12-22 16:24:21 -05:00
  • 6639bc1300 Fix overwriting of username if no first/last name snipe 2015-12-22 13:21:51 -08:00
  • e272cab82f Add Company name to Asset Importer. Tested on one set of data. Daniel Meltzer 2015-12-22 16:13:30 -05:00
  • 5967dbae64 Company helper, updated bulk view to show model number snipe 2015-12-22 11:39:42 -08:00
  • f42a3c8918 Added company to bulk edit snipe 2015-12-22 11:12:26 -08:00