DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-20 04:24:23 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
5865 commits 97 branches 267 tags 296 MiB
Commit graph

5865 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Brady Wetherington 9ca20e4964
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting 
Improve ldap search error reporting
 2020-08-11 17:33:19 -07:00
Brady Wetherington 456a74d88c De-merge out incorrectly merged files. Whoops! 2020-08-11 16:41:20 -07:00
Brady Wetherington 799c059070 Add internationalized version of LDAP error message 2020-08-11 16:39:02 -07:00
Brady Wetherington c62d43a778 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better 2020-08-11 16:39:02 -07:00
Brady Wetherington b725bd0fae Add @PeterUpfold as a contributor 2020-08-11 16:39:02 -07:00
snipe 09190e05ae
Add @PeterUpfold as a contributor 2020-08-10 17:24:20 -07:00
Brady Wetherington e0644dbbf6
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround 
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
 2020-08-10 17:22:31 -07:00
snipe 5b6925b00c
Removed debugging :( 2020-08-04 21:00:37 -07:00
snipe df17a859bf
Changed modal IDs so manager creation modal works on user creation main page 2020-08-04 20:59:54 -07:00
snipe 24c43056ba
Moved pGenerator script to default layout footer 
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
 2020-08-04 20:58:28 -07:00
snipe 4e0a9c7a94
Fart fix 
I just…. don’t ask.
 2020-08-03 12:35:34 -07:00
snipe 6a089f86f8
Fixed pathing for accessories 2020-08-03 11:17:56 -07:00
snipe 606b7e905d
Small edits to PR template 
Slight text changes to ask specifics about versions
 2020-07-31 17:02:33 -07:00
snipe d73ddad477
Created a PR template 
First draft of the PR guidelines template
 2020-07-31 16:59:26 -07:00
snipe 502b3c50a9
Fixed upload preview (fixed regression from #6736) 
This change appears to have been stomped on in one of the merges. :(
 2020-07-31 14:36:50 -07:00
snipe 9a39cf721e
Merge pull request #8258 from ballertv/features/consumable-api 
This looks great, thank you!
 2020-07-31 12:18:49 -07:00
snipe 2bb5ac61a9
Add @sanjay900 as a contributor 2020-07-31 11:02:06 -07:00
snipe 3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-07-31 11:01:35 -07:00
Brady Wetherington 7410b16835
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 
Add new useraccountcontrol value for valid AD users
 2020-07-24 16:22:44 -07:00
andres 8994f3e15e cleanup 2020-07-22 19:57:06 -04:00
andres d23f1a77ca implement checkout API 2020-07-22 19:56:31 -04:00
snipe e955c983a3
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer 
Added address, city, state and country to importer and city to bulk editor
 2020-07-22 13:43:29 -07:00
Brady Wetherington b09e7d19b3 Add new useraccountcontrol value for valid AD users; document algorithm and values 2020-07-22 13:32:16 -07:00