DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5638 commits 97 branches 266 tags 291 MiB
Commit graph

2515 commits

Author SHA1 Message Date
snipe 8a38b9d018 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-20 14:34:35 -08:00
Brady Wetherington 734cb941dd
Fix for #8772 - initial LDAP import of users are deactivated (#8776) 2020-11-20 11:11:14 -08:00
snipe c66f8c04c8 For for deleted user API 2020-11-18 14:57:44 -08:00
snipe 551e28eec9 Fixed #8749 - added more default colors to prevent missing index in pie chart math 2020-11-18 07:06:14 -08:00
Brady Wetherington 8457207c8f
Fix for 500-page on deactivated LDAP user trying to log in (#8774) 2020-11-17 22:31:22 -08:00
snipe 2ea805b7ed Added search/sort by Location OU, added to listing 2020-11-17 22:17:07 -08:00
Brady Wetherington 3dda4c9116
Add a new UAC setting to valid User Accounts for Active Directory (#8775) 2020-11-17 19:25:49 -08:00
snipe 0286cf6d46 Prevent license categories from being deleted if there are licenses in that category 2020-11-17 19:22:10 -08:00
Brady Wetherington de6f3f866f
Attempt to solve LDAP sync overriding administrator choices (#8742) 2020-11-17 00:11:00 -08:00
NMC 402fecd408
Fixed #7850: allow xlsx file. (#8386) 
Thanks!
 2020-11-16 21:32:15 -08:00
Brady Wetherington a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751) (#8757) 
* Start work on re-adding back the "Test LDAP logins" feature to develop

* Add back-end method to allow LDAP test users to try to log in.
 2020-11-16 21:23:08 -08:00
snipe fbaf6e2494 Fixed #8747 - upload path for uploaded images 2020-11-16 16:39:02 -08:00
snipe 1f5bcf2475 Added option to download activity report 2020-11-13 16:25:05 -08:00
snipe 052f8e2c42 Addresses - not fixes - #8740 
More investigation here is needed
 2020-11-13 12:34:42 -08:00
snipe e9578ba8a1 Fixed #8737 - incorrect validation string for components update 2020-11-13 12:09:48 -08:00
snipe 644084658a Merge remote-tracking branch 'origin/develop' 2020-11-13 04:30:03 -08:00
snipe 08784f9cc5 Make expected_checkin fillable 2020-11-13 03:22:26 -08:00
snipe a87e615e7f Fixed #8544 - escaping on maintenance notes 2020-11-12 23:55:16 -08:00
snipe fc6a33ad38 Added some LDAP debugging - related to #8670 2020-11-12 22:19:16 -08:00
snipe 896ce3456e Possible fix for #8670 - LDAP users deactivated on login 2020-11-12 22:18:49 -08:00
snipe 9db191f0b2 Fixes for #8732 - Flysystem paths, migrator script 2020-11-12 21:46:06 -08:00
snipe c7d752fb65 Added S3 url into CSP 2020-11-12 19:50:01 -08:00
snipe 6dccf399a5 Fixed offset issue for #8732 2020-11-12 15:51:31 -08:00
snipe d537fc5c32 Added linebreak to console confirmation 2020-11-12 15:21:00 -08:00
snipe 9164dda64f Added artisan command to purge logins 2020-11-12 15:20:15 -08:00
snipe 5ea9c31eab Removed debugging 2020-11-12 15:14:56 -08:00
snipe c8572deb5c Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-12 15:13:50 -08:00
snipe 57d25ebb20 Fixed #8719 - use same convention for file names on licenses as we do on assets 2020-11-12 15:13:45 -08:00
Dampfklon be114176a2
Refactor Expected Checkin Notification into markdown and enable translation (#8236) 
Co-authored-by: snipe <snipe@snipe.net>
 2020-11-12 15:09:40 -08:00
Dampfklon 4ef11c463c
Enable translations of checkin notifications (#8235) 2020-11-12 15:05:57 -08:00
snipe f0e04ab9e4 Fixed #8726 - disallow archived assets to be checked out 2020-11-12 15:01:13 -08:00
snipe 8a65081768 Possible fix for #8732 2020-11-12 14:47:38 -08:00
snipe c451fde466 Fixed exception namespace 2020-11-12 14:27:59 -08:00
Anthony Winstanley cc79bb1449
Exclude blank LDAP attributes 
Asking for '' attributes is an error for some LDAP servers.
 2020-11-12 09:34:28 -08:00
snipe 7f7064c835 Make last_checkout fillable 2020-11-11 13:30:11 -08:00
snipe 7d708572fc Slightly nicer formatting for query 2020-11-10 07:43:54 -08:00
snipe ea68ff1284 Sigh. Typo 2020-11-10 06:51:40 -08:00
snipe 66ccf4da03 Merge remote-tracking branch 'origin/develop' 2020-11-10 06:44:10 -08:00
snipe 0b4a13156f Added more detail and dryrun to assigned_to vs log checker script 2020-11-10 06:43:36 -08:00
snipe a8a3962008 Merge remote-tracking branch 'origin/develop' 2020-11-10 06:17:04 -08:00
snipe e110a7b15e Experimental script to find mismatched IDs based on logs 2020-11-10 06:16:15 -08:00
snipe 30d68309a9 Add ability to checkout an asset if the user it’s assigned_to isn’t valid 
This would only happen if a merge-users went wonky
 2020-11-10 05:06:47 -08:00
snipe 547d1a5a93 Merge remote-tracking branch 'origin/develop' 2020-11-10 04:43:20 -08:00
snipe a43fb060f4 Throw an error if the asset cannot be updated in the merge 2020-11-10 04:41:40 -08:00
snipe c607d89817 Merge remote-tracking branch 'origin/develop' 2020-11-10 01:59:18 -08:00
snipe 044dfe2620 Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard 2020-11-10 00:54:39 -08:00
snipe b7cc12a466 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:53:23 -08:00
snipe 5abfbdd1d2 Allow API token expiration in years to be configured via env 2020-11-09 22:52:55 -08:00
snipe 31bbb2d035 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:43:41 -08:00
snipe 460485d843 Make API tokens expire in 20 years 
TODO: Make this configurable and report the expiration in the UI
 2020-11-09 22:33:43 -08:00