Commit Graph

8854 Commits

Author SHA1 Message Date
snipe fdafaf2802 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-08-26 13:40:10 -07:00
snipe 9ba290e507 Add @jbiel as a contributor 2020-08-26 13:39:53 -07:00
snipe 9f5669e70a Merge pull request #8373 from snipe/tweak_v5_ldap_migration
Tweak v5 ldap migration for backwards-compatibility with working pre-v5 Active Directory setups
2020-08-26 13:34:25 -07:00
snipe c23e28d0df Merge pull request #8372 from snipe/fix_adldap_sync
Fix adldap sync
2020-08-26 13:34:07 -07:00
snipe 5abd85003c Merge pull request #8371 from snipe/bushelpowered-develop
Fixed #7919 - LDAP Logins + query filters
2020-08-26 13:33:41 -07:00
Brady Wetherington 14da328dea Remove extraneous log line 2020-08-26 13:10:47 -07:00
Brady Wetherington 6e9f36be58 Update ad_append_domain setting for backwards-compatibility with v4 and earlier 2020-08-26 13:09:32 -07:00
Brady Wetherington 67a1d2fa5f Remove hardcoding of LDAP Auth query to 'uid=', use setting instead 2020-08-26 12:25:10 -07:00
snipe 24be73f76b Use image handling request for logo uploads 2020-08-26 12:17:50 -07:00
snipe a86dc52695 Added fieldname to file name for better clarity on setting logos 2020-08-26 12:17:36 -07:00
snipe 1ff7e6b834 Use Storage facade for user presenter 2020-08-26 12:17:18 -07:00
snipe fa2dfc3e87 Use updated request signature for models 2020-08-26 11:59:30 -07:00
snipe d25a05d748 Misc Flysystem/image upload request fixes 2020-08-26 11:53:36 -07:00
snipe 139c874308 Fixed delete old image on upload 2020-08-26 02:48:07 -07:00
snipe db385b5f6b Fixed assetmodels selectlist 2020-08-26 02:32:39 -07:00
snipe f385f3e928 Fixed user image upload
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe de21f00771 Fixed assetmodels upload 2020-08-26 02:29:37 -07:00
snipe 37568ae9ec Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
2020-08-25 20:49:37 -07:00
snipe 32ad9050cf Added google maps to CSP 2020-08-25 20:48:53 -07:00
snipe 01a832169c Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
2020-08-25 20:38:31 -07:00
snipe 3c6883489c Added assignedTo scope 2020-08-25 20:37:30 -07:00
Brady Wetherington 6c23e881c7 Merge branch 'develop' of https://github.com/bushelpowered/snipe-it into bushelpowered-develop 2020-08-24 21:42:04 -07:00
Brady Wetherington b721a977c0 Fix PHP 7.4 deprecation warnings in ldap-sync script. 2020-08-24 21:35:00 -07:00
snipe 53c46ac8de Fixed stupid import layouts 2020-08-24 21:15:46 -07:00
snipe 3cba174dfb Merge pull request #8359 from snipe/fixes/misc_flysystem_fixes
Misc flysystem fixes
2020-08-24 19:28:40 -07:00
snipe a90d2ba077 Fixed suppliers upload 2020-08-24 18:53:33 -07:00
snipe e5dd6035b9 Fixed the other upload handleUploads signatures 2020-08-24 18:32:40 -07:00
snipe 66686f8080 Added some debugging - will remove at RC 2020-08-24 18:32:15 -07:00
snipe 041fc20955 Fixed Companies and Categories uploads 2020-08-24 15:43:11 -07:00
snipe b97ff4e907 Fixed Depts uploads 2020-08-24 15:10:26 -07:00
snipe 232e3f30aa Fixed accessories “current image” path in edit form 2020-08-24 14:30:55 -07:00
snipe 5aeac3c9e0 Fixed parse error 2020-08-24 14:30:43 -07:00
snipe 0658f17359 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-08-24 12:37:40 -07:00
snipe bcad49ce79 Try to better handle slack “too many requests” issue 2020-08-14 16:10:22 -07:00
snipe b5acca89d7 Check for admin for slack notifications 2020-08-14 16:02:15 -07:00
snipe e52919cf1b Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
2020-08-14 15:35:15 -07:00
snipe 29f3a5c48f Use more verbose annotation for Auth::user if/else 2020-08-14 15:27:40 -07:00
snipe 134e8e6fb9 Moved user email nulling until after the save 2020-08-14 15:25:07 -07:00
Brady Wetherington 714576be45 Merge pull request #8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
2020-08-14 15:24:03 -07:00
Brady Wetherington fa291beaeb Merge pull request #8329 from snipe/fix_depreciation_report_v5
Fix deprecation report for customers with many active assets
2020-08-14 15:23:49 -07:00
Brady Wetherington 4b7f6a95e3 Fix deprecation report for customers with many active assets 2020-08-14 15:07:59 -07:00
Brady Wetherington 5128992940 Fix deprecation report for customers with many active assets 2020-08-14 15:03:03 -07:00
snipe 0291323502 Use the user as the target 2020-08-14 14:57:58 -07:00
Brady Wetherington 262a964760 [WIP] fix ldap-sync for v5 with AdLdap2 2020-08-14 14:45:05 -07:00
snipe e0f6f9b839 Artisan command to check in licenses from all users 2020-08-14 14:43:37 -07:00
snipe f1a6308002 Check for Auth::user before trying to log id (for cli) 2020-08-14 14:43:07 -07:00
Michael Pietsch 4f5374b2e8 enable use custom file based saml certificate/private key 2020-08-14 12:25:00 +02:00
snipe 19d8d7b146 Updated components and consumables to use storage facade 2020-08-12 13:02:54 -07:00
snipe b999c50a2e Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
2020-08-12 12:37:47 -07:00
Godfrey M e3906b245c added translation for admin/licenses/message.not_found 2020-08-12 12:27:18 -07:00