DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10428 commits 97 branches 266 tags 292 MiB
Commit graph

4169 commits

Author SHA1 Message Date
Ivan Nieto Vivanco 51efd9b413 Adjust the date format for purchase_date field 2023-02-24 10:59:31 -06:00
Ivan Nieto Vivanco 6bd72125bd Deletes problematic cast 2023-02-23 22:31:41 -06:00
snipe 5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report 
Paginate accessories report
 2023-02-23 12:26:17 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
snipe 5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation 
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
 2023-02-22 16:03:51 -08:00
akemidx 690970b4aa fixing ff error 2023-02-22 18:18:20 -05:00
Marcus Moore f63710fb5c
Remove unused import 2023-02-22 12:34:56 -08:00
Marcus Moore 7667b0a216
Remove extra line 2023-02-22 12:34:35 -08:00
Marcus Moore 931ca98c02
Remove middleware bypass 2023-02-22 12:33:55 -08:00
snipe 81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report 
Added images to emailed user inventory report [sc-19801]
 2023-02-22 10:38:07 -08:00
snipe 05f6d0bd5e
Merge pull request #11984 from nh314/Correct-assignedusers-relation 
Correct assignedusers relation setting
 2023-02-21 20:15:20 -08:00
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
Ivan Nieto Vivanco d494afcf01 Add order by clause, to ensure assets and accessories are in order in the report 2023-02-21 21:24:19 -06:00
Ivan Nieto Vivanco 6e994c209f Adds setter to model Asset class for expected checkin 2023-02-19 12:31:10 -06:00
snipe 754842f620 FML - this is a hotfix and I don’t know why this is causing problems 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-16 16:58:00 -08:00
Godfrey M 58801dbb0b allows users to clear their slack settings 2023-02-16 08:43:12 -08:00
snipe e9ab90eafc
Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting 
Have acceptance result notifications adhere to alerts enabled setting
 2023-02-15 18:46:08 -08:00
Godfrey M 7b510d5f2b greys out submit button conditionally 2023-02-15 15:46:05 -08:00
snipe 27e5832a28 Use existing slack translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 14:06:52 -08:00
snipe ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs 
Adds Livewire slack inputs
 2023-02-15 13:27:07 -08:00
snipe de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation 
Enforce Y-m-d as date format for date fields
 2023-02-15 12:54:22 -08:00
snipe 25461caa2c Removed date validation rule 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 12:53:55 -08:00
snipe bfac0fc811
Merge pull request #12470 from inietov/fixes/rollbar_16883_attempt_assign_on_null 
Fixed Rollbar 16883 Error: Attempt to assign property "assigned_to" on null
 2023-02-15 12:33:32 -08:00
snipe 057f0be20a
Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null 
Fixed ErrorException:  Attempt to read property "id" on null [sc-19855]
 2023-02-15 12:32:53 -08:00
snipe 7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions 
Silence E_WARNING "exceptions"
 2023-02-15 11:56:37 -08:00
Brady Wetherington 3757c7e353 Make early-boot errors (syntax, others) be more easy-to-read 2023-02-15 11:31:13 -08:00
snipe 3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes 
Style fixes
 2023-02-15 11:07:59 -08:00
Ivan Nieto Vivanco 6936efd387 Remove e() function from customfield format input 2023-02-12 16:27:37 -06:00
snipe b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout 
Fix asset names being removed during API checkout requests
 2023-02-14 12:22:03 -08:00
Marcus Moore 8e00191b69
Add comment 2023-02-14 12:19:16 -08:00
Marcus Moore a94f19a68e
Use name if provided by asset checkout request 2023-02-14 12:08:20 -08:00
Marcus Moore 2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
Marcus Moore 73f355f3a8
Return 422 instead of 500 when import is invalid 2023-02-08 12:39:42 -08:00
Marcus Moore b3881a43a7
Fix return type 2023-02-08 12:34:25 -08:00
Marcus Moore c2c666aef0
Formatting 2023-02-08 12:32:57 -08:00
Marcus Moore 5962f1b627
Catch json encoding exceptions and display them to the user 2023-02-08 12:21:51 -08:00
Ivan Nieto Vivanco 49b6a1cc53 Adds translation strings to theinventory report sent to users 2023-02-07 18:29:19 -06:00
snipe c1d484b5df Fixed mismatched field/fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 13:31:50 -08:00
snipe ea644f8d47 Still throwing errors, but trying to fix the docblock 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 11:02:20 -08:00
snipe dd5f256450 We shouldn’t need this because aliases?? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 11:02:02 -08:00
snipe 219d92dcfb The sea, Brady. 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 11:00:30 -08:00
Ivan Nieto Vivanco d4c838a979 Add condition in activity report to only access assigned item id if it exist 2023-02-07 11:26:49 -06:00
Ivan Nieto Vivanco ddabe7cc9f Added Guard Clause to License Importer to return if no empty seat is found 2023-02-07 01:36:55 -06:00
snipe cd5546e4a1 Fixed wonky switch statement indenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:44:17 -08:00
snipe d52d32fed9 Fixed visibility for constants and methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:44:02 -08:00
snipe 7363d4e223 FIxed yoda operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:35 -08:00
snipe c8c5dddcc1 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:19 -08:00
snipe 1651dbb68d Use null coalescing operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:00 -08:00
snipe d95adcae37 Fixed Implicit array creation is disallowed. 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:41:54 -08:00
snipe 8a8575bf2d Made constant DATA_SESSION_KEY public 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:40:32 -08:00
snipe 590cb6a15b Removed unneeded concat 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:40:09 -08:00
Marcus Moore 38cdcdf064
Eager load company 2023-02-06 10:59:51 -08:00
Godfrey M 74c64c1fc5 adds validation to the update hook, removes typos and deadlines 2023-02-06 09:40:57 -08:00
Marcus Moore 0cefc7de15
Skip security headers middleware when testing 2023-02-02 18:37:35 -08:00
snipe 51f3857a31 Fixed something I think I broke 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 15:32:45 -08:00
akemidx b8951e2b54 fixing name from vipuser to vip 2023-02-02 15:58:05 -05:00
Godfrey M 17f1772143 removes postslack from settings controller 2023-02-01 16:58:08 -08:00
Godfrey M 3a86547ef5 fixes messages for integration test, removes slack request file, rehouses ajax method 2023-02-01 16:51:05 -08:00
snipe 0cfeab8c50 Added an exit for the LDAP disabled sync short-circuit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:46:58 -08:00
snipe 67e6089805 Short circuit the LDAP sync is LDAP is disabled 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:36:30 -08:00
snipe d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe 2da4578aa5
Merge branch 'develop' into slack_message 2023-02-01 13:43:09 -08:00
snipe 1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name 
Fixed #12418 - added ability to edit custom field names via GUI
 2023-02-01 13:39:39 -08:00
snipe 0d4ca218c5
Merge pull request #12437 from uberbrady/ldap_allow_undelegatable_users_to_login 
Fixed: Active Directory "not-delegated+dont-expire-password+normal-accounts" can now login
 2023-02-01 13:38:59 -08:00
akemidx 90c1bfe03d fixing pr 2023-02-01 16:12:39 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
Godfrey M f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
Marcus Moore a45ce468cc
Update return type for routing mail notifications 2023-02-01 11:44:56 -08:00
Marcus Moore 3580bdae86
Use object accessor instead of array accessor 2023-02-01 11:44:35 -08:00
snipe f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe 2d45ebe103
Merge pull request #12433 from inietov/fixes/asset_declined_date_issues 
Fixed Invalid date value on assets acceptance mail notification
 2023-01-31 19:14:51 -08:00
Brady Wetherington a4173e3881 Permit not-delegated+dont-expire-password+normal-accounts to login 2023-01-31 16:49:41 -08:00
Godfrey M 1e0c58c3cf saves data correctly now 2023-01-31 11:32:05 -08:00
lukasfehling cddae4869f fixed the endpoint for user notification with all their assigned assets 2023-01-31 18:27:25 +01:00
Godfrey M fc044528b8 validation is working, success message appears, database is not updating 2023-01-30 16:10:02 -08:00
Ivan Nieto Vivanco ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
snipe 22b0b9b090 Fixed gates on fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:05:41 -08:00
snipe 583a0412fe Added edit fieldsets translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:23 -08:00
Godfrey M a63ea560ae adds submit button, getting setAttribute error 2023-01-26 15:17:08 -08:00
Marcus Moore 39289dd18e
Use user provided alert email for checkout acceptances 2023-01-26 13:18:18 -08:00
Marcus Moore 6fc8982478
Have acceptance result notifications adhere to alerts enabled setting 2023-01-26 12:59:33 -08:00
akemidx df31a76906 fixed apostraphe 2023-01-26 15:02:39 -05:00
Brady Wetherington 4a54586690 Add to Accessories#index an additional gate-check against reports.view 2023-01-26 11:56:06 -08:00
Godfrey M 62b4c79150 adds a couple error messages 2023-01-25 16:38:08 -08:00
Godfrey M a69cb6204a adds rest of inputs, and corrects Data binding 2023-01-25 16:22:34 -08:00
Brady Wetherington cfe9c687f9 Mark a bunch of SCIM config as nullable 2023-01-25 15:54:57 -08:00
Brady Wetherington 91cf683f3d Re-do the entire SCIM config so it no longer inherits 2023-01-25 15:53:46 -08:00
Godfrey M 2e22eeade5 adds one input 2023-01-25 14:29:20 -08:00
akemidx 53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe 4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00
Brady Wetherington ab12ad1140 Resolves Rollbar error 16746 - missing array key 'extension' 2023-01-24 18:19:26 -08:00
snipe 9c79fc19cb Tightened up and removed some validation that wasn’t needed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:37:15 -08:00
snipe fd2a057d38 Make audit dates fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:36:58 -08:00
Brady Wetherington b00333c9f5 Merge remote-tracking branch 'upstream/develop' into develop 2023-01-24 17:36:39 -08:00
Brady Wetherington c9f0f5fe8b Change Accessories report to use server-side pagination from URL 2023-01-24 17:35:44 -08:00
snipe 3c4f254583 Enforce Y-m-d as date format for date fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 13:38:53 -08:00
akemidx 596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
Marcus Moore b92d1d3ec7
Logically group query when searching users to scope to company 2023-01-24 11:54:56 -08:00
Godfrey M 0f8ee22053 Creates Slack Setting Form 2023-01-24 09:25:05 -08:00
snipe dc155846ca Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:49:17 -08:00
snipe 7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
snipe 02dcb0fbd7 Shorten the additiona form request invocation to just ImageUploadRequest 
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.

Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:37:35 -08:00
Jeremy Price d3bcc48ae5 [imports] fix "Backup before importing?" checkbox on import page 
We were always taking backups before import, no matter the status of
this box.

Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.

We're now checking the status, and it behaves as expected
 2023-01-23 15:08:59 -08:00
snipe 41537a2449 Added field to the API controller endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:44 -08:00
snipe 5f9af7d509 Updated API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:28 -08:00
snipe febfcd4803 Updated model with new field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:19 -08:00
snipe cad76f671a Added asset_eol_date to blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:42 -08:00
snipe cd8cb445ba Corrected fieldname for user fieldname for avatar in Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:53 -08:00
snipe 48c85966d7 Added gravatar and avatar as fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:07:17 -08:00
snipe a0aed19f95 Refactor image handler 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:55 -08:00
snipe f77d871dff Use the imageHandler for profile avatar changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:20 -08:00
snipe 60eab08735 Added ->with(‘users as users_count’) in Accessory query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:41:07 -08:00
snipe 90c1631820 Added users_count to transformer for API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:35 -08:00
snipe dceb77d4d4 Refactored numRemaining, removed unnecessary numCheckout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:20 -08:00
snipe 46e3e8a3dd Added new users_count field to API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:39:53 -08:00
Marcus Moore 181f96ad33
Allow users to set a blank asset name during checkout 2023-01-19 12:35:44 -08:00
snipe fa9116b184
Merge pull request #12369 from snipe/features/add_byod_to_assets 
Added BYOD to assets
 2023-01-18 16:09:45 -08:00
snipe 155977de2d
Merge pull request #12370 from marcusmoore/fix/file-upload-tab-permissions 
Fixed file uploads for accessories, components, and consumables
 2023-01-18 16:08:53 -08:00
snipe 378dc968b7 Derp. Copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 15:44:28 -08:00
snipe 0c39c7a53d Updated blades to add byod as a “status” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:25:46 -08:00
snipe acd182e3d2 Added byod to presenter with boolean formatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:10:30 -08:00
snipe 48b8cfcef9 Added byod to model, removed duplicate validation rule 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:04:36 -08:00
snipe f626413502 Added byod to API transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:04:02 -08:00
snipe b80d52a9c3 Added byod to asset controller for create and update methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:51 -08:00
snipe ee4b8f4694 Added byod to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:03:31 -08:00
Godfrey M 7ce230fadc missed a few renames 2023-01-18 08:57:59 -08:00
snipe 956bd384b0
Merge pull request #12364 from snipe/features/make_2fa_sortable 
BREAKING: Partial fix for #12356: Make 2FA sortable in user list
 2023-01-17 20:24:05 -08:00
snipe c3e4d9d773 Make column name consistent with field name (BREAKING) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 18:27:47 -08:00
snipe f08babfa8a Just moved some stuff around - no actual meaningful code changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:22:03 -08:00
snipe 4ef0005e7c BREAKING: changed API fieldname result for 2FA 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:40 -08:00
snipe dbda288a44 Formatting changes only for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:20 -08:00
snipe eaf9332096 Added filterability to 2FA fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:21:03 -08:00
Marcus Moore 23a1b2d60a
Register the consumables.files ability 2023-01-17 17:15:23 -08:00
Marcus Moore 6c89f08193
Register the accessories.files ability and allow users with the ability to upload files for accessories 2023-01-17 16:59:50 -08:00
corydlamb 295f0dd1f5
Update WelcomeNotification.php 
Used htmlspecialchars_decode to fix the issue I had involving Ampersands in the password field (and I'm assuming the other fields) of the welcome notification email. Changes are all in lines 22-26. Sorry if I'm not doing this very well as this is my first pull request.
 2023-01-17 19:33:25 -05:00
Marcus Moore e23ee7540d
Register the components.files ability 2023-01-17 15:45:40 -08:00
snipe f4630d67be Added catergories to default visiable set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-15 17:07:50 -08:00
snipe 9d0a15990e Check that the $use_db_field has a value before attempting a delete 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 11:26:11 -08:00
snipe 4f8951f6f1
Merge pull request #12335 from uberbrady/windows_snipeit_restore 
Fixed #12004: Snipe-IT restore didn't work on Windows
 2023-01-11 11:03:44 -08:00
snipe 459c95064e Fixed default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 17:54:04 -08:00
snipe 0b0fdd8aa5 Small formatting fixes, fixed typo in comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:32:18 -08:00
snipe 8f3a237ea0 More comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:29:51 -08:00
snipe 151719a91c Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:24:46 -08:00
snipe 825df2cf75 Load up the item counts with the individual API methods for accurate numbers without n+1 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:17:03 -08:00
snipe b66cd313b9 Refactored itemCount() to use existing blah_count fields if they exist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:16:25 -08:00
snipe bef4224e14 Added notes to itemCount() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 13:50:24 -08:00
snipe 249b188654 Refactor category API and transformer for query optimization 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 13:30:01 -08:00
Brady Wetherington 2170343958 Fixed #12004: Snipe-IT restore didn't work on Windows 2023-01-10 13:06:47 -08:00
snipe 529b005d1e We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:05:51 -08:00
snipe 7846251d25 Re-added return for no results (derp) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:43:57 -08:00
snipe cc665d50ed One more refactor, hopefully simplifying 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:40:12 -08:00
snipe ae76d46f87 Small refactor to ALWAYS return deleted assets in a collection transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:23:05 -08:00
snipe bf849128fc Replicate the response behavior in the bySerial endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:57:47 -08:00
snipe 44be8c8f60 Determine which transformer to use based on number of assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:54:21 -08:00
Brady Wetherington 39b1a5a8a0 Remove old cache key for settings 2023-01-09 16:19:25 -08:00
Brady Wetherington 2d0ac5b48b The cache system in getSettings() cached values "forever." That's bad. 2023-01-09 16:16:09 -08:00
Brady Wetherington cbffd105a2 Fix LDAP default group feature 2023-01-09 15:23:19 -08:00
snipe 6e42bce409 Removed $start variable from calback 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:04:06 -08:00
snipe 1a3c947b14 Chunk sync script 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 17:57:52 -08:00
snipe 381f89c5a8 Added format to array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 13:15:30 -08:00
snipe db43628bdc Added default field info to models API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 13:12:54 -08:00
snipe 9c63f426d9 Added missing translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-04 14:09:14 -08:00
Brady Wetherington c4f900e9af Change license_seat changing method to properly 'true up' license seats 2023-01-04 13:02:53 -08:00
snipe fa439a1928 Check that the array key exists before trying to seed it 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-03 14:45:23 -08:00
snipe d187174f00
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator 
Added: validation for department names at Company locations
 2022-12-22 11:29:12 -08:00
Ivan Nieto Vivanco 3a9b8a4993 Calculate the proper amount of people in the dashboard if Full Company Support is enabled 2022-12-20 18:39:17 -06:00
snipe 88291cadc1
Merge pull request #12254 from akemidx/documentating_something 
Commenting on a scope in Models/Company.php
 2022-12-19 12:41:32 -08:00
akemidx 94afe2bc6a edits & typo fixes 2022-12-19 14:48:43 -05:00
snipe 399c7590cd
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets 
Fixed 500 when downloading the Unaccepted Assets report  [sc-19555]
 2022-12-15 14:19:41 -08:00
snipe d0c5ba70f6
Merge pull request #12242 from inietov/features/add_purchase_cost_column 
Added `purchase_cost` to user's default view [sc-19680]
 2022-12-15 12:42:29 -08:00
akemidx 133d6ffa50 Commenting on a scope in Models/Company.php 2022-12-15 15:18:24 -05:00
snipe 29c2ff56ec
Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled 
Removed extra logging case that was very noisy
 2022-12-15 11:26:49 -08:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
Ivan Nieto Vivanco b142f8e012 Add the permission to show purchase cost column to non-admin sessions 2022-12-14 23:00:35 -06:00
snipe 418ddcfac3
Merge pull request #9876 from Toreg87/fixes/locations-deletable 
Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
 2022-12-14 17:46:53 -08:00
snipe d13a237000
Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer 
Adds remote field to the user importer
 2022-12-14 12:13:18 -08:00
snipe fabefa61b0
Merge pull request #12243 from akemidx/new_grey_out_when_no_assets 
Created method in users.php for adding up all assigned to user and pr…
 2022-12-13 14:00:48 -08:00
akemidx f3e57d7dc0 fixing PR 2022-12-13 16:00:59 -05:00
snipe c432fb9d70
Merge pull request #12181 from Godmartinz/gh12163_asset_age 
Adds asset age to asset index and asset view pages
 2022-12-13 10:28:17 -08:00
akemi 07ae91b00f Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned. 2022-12-12 15:47:53 -05:00
Godfrey M fa872b09a9 fixes a typo, the world is great again 2022-12-12 10:38:31 -08:00
snipe 4ac09ff4e4 Add email in assigned_to on asset transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-09 16:07:17 -08:00
snipe 775df0ab60
Merge pull request #12221 from snipe/fixes/throttles_reset_password_form 
Add throttle for password reset form
 2022-12-08 14:51:22 -08:00
snipe f7da87520c
Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing 
fixes a regression with the csv assigned to fields
 2022-12-07 16:18:32 -08:00
snipe c3a6874b16 Add throttle for password reset form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-06 20:42:40 -08:00
Ivan Nieto Vivanco eb67d1b064 Filter items from the report if null returned 2022-12-06 18:00:16 -06:00
Godfrey M bbd04f8876 adds the rest of the fields for Remote 2022-12-06 11:13:24 -08:00
Godfrey M 36901d271b adds csvmatch for remote. Im a bit lost though lol 2022-12-05 16:28:19 -08:00
akemi 2f8a435e18 fixing curly quotes 2022-12-05 18:06:28 -05:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
Godfrey M 3206929ee4 adds AgeFormatter, not working yet 2022-11-29 09:51:42 -08:00
snipe 1fe0bfe17e Removed extra logging case that was very noisy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:27:42 -08:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M 8d861cfd82 adds age to the asset table 2022-11-28 10:59:18 -08:00
snipe 3ef578eb56
Merge pull request #12164 from Robert-Azelis/patch-7 
Fix categories view columns matching
 2022-11-23 18:47:02 -08:00
Ivan Nieto Vivanco c082d8b90e Return empty string if no MAIL_REPLYTO_ADDR var set 2022-11-23 18:22:31 -06:00
Robert-Azelis c2cfd8ff53
Update CategoryPresenter.php 2022-11-23 19:00:08 +01:00
Robert-Azelis 20ad4fb681
Update CategoryPresenter.php 
Fix snipe#12153
 2022-11-23 18:42:38 +01:00
snipe ba4c37a7f4
Merge pull request #12139 from snipe/fixes/custom_fields_api_patches 
Fixed #9949 - PATCH to custom fields failing on validation (alt approach to #12011)
 2022-11-17 21:28:39 +00:00
snipe f0c5560c1b
Merge pull request #12141 from Godmartinz/adds_serial_number_to_history 
Added `serial` column to the user history page
 2022-11-17 21:15:26 +00:00
snipe 774962c122 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-17 21:14:35 +00:00
Godfrey M 86bc409d3a adds serial column to the action logs 2022-11-17 12:57:53 -08:00
snipe 24841a75d4 Move common things into the model level validation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-17 19:41:10 +00:00
Godfrey M a02a04d601 fixes a regression with the csv assigned to fields 2022-11-16 16:34:57 -08:00
snipe 3997085faf
Merge pull request #12122 from Godmartinz/fixes_checkout_to_all_description 
fixes checkout to all description
 2022-11-16 21:56:53 +00:00
snipe 489895a5fa Added comments and spacing for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:48:28 +00:00
snipe 1122562b4e Handle use case where there are no custom fields for any assigned models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:45:50 +00:00
snipe 5df76155ce Check for the format index in the $data array when creating a new custom field via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 15:53:16 +00:00
Instead of looking elsewhere, it is better to come here together 2fc7a15372
Fixed: #12109 2022-11-16 18:22:11 +08:00
Godfrey M 8a0517fb5d removes data dump 2022-11-15 15:59:47 -08:00
Godfrey M 90828e3a87 fixes variable name 2022-11-15 15:51:52 -08:00
Godfrey M 45636b8114 adds should_autoassign boolean to users table 2022-11-15 15:42:57 -08:00
Godfrey M 9fefdea9de fixes checkout to all description 2022-11-15 12:50:46 -08:00
snipe 6400bdc266
Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag 
Added ability to include deleted items in tag search endpoint
 2022-11-15 17:54:34 +00:00
snipe ffd252a00c
Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification 
Added: API endpoint to trigger a user email notification with their assigned assets
 2022-11-15 17:51:15 +00:00
snipe 7fcf6f2463 Removed deleted parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:47:21 +00:00
snipe 2c5a0d370c Clean up API byserial and bytag, allow deleted param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:33:56 +00:00
snipe bcbe517446 Added ability to include deleted items in tag search endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:18:09 +00:00
lukasfehling d9a9bd1c0d Added a api endpoint for sending email notifications to users with their assigned assets 2022-11-15 18:17:51 +01:00
snipe 9a5d431962 Allow searching firectly for asset tag and serial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:13:26 +00:00
snipe 50431c046f Fixed missing slash in stdClass 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:04:06 +00:00
snipe ae259f36ae
Merge pull request #12106 from fernando-almeida/develop 
Fix HTTP AssetTransformer to generate an empty object for missing custom fields
 2022-11-15 15:54:43 +00:00
snipe 56c4fa7c27 Override display settings if field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:41:31 +00:00
Fernando Almeida 47ee2a8153 Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array. 2022-11-14 16:31:08 +00:00
snipe 1e34398c99 Permissions check on the field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:12 +00:00
snipe 1fa624420e Removed unneeded relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:49 +00:00
Godfrey M 92ae271292 adds validation for department names at Company locations 2022-11-09 13:11:33 -08:00
snipe 7c37c70164 Added new field to allowed_fields so that the API can change them if needed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:22 +00:00
snipe 52dc5aa4ba Added field to controller and tranformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:26:59 +00:00
snipe 04b6f023ae Use new upload string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:57:50 -07:00
snipe 3c7d63c060 Disallow uploads if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:52:23 -07:00
snipe 6d5ace0458
Merge pull request #12049 from uberbrady/improve_scim_externalid_support 
Fixed writes to the `externalId` from SCIM
 2022-11-02 15:43:55 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 97aeb1fcec Use the generic file uploads strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:31:23 -07:00
snipe f1cb7ee410 Fixed some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:39 -07:00
snipe 84c0f50266 Added ComponentFilesController 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:10:04 -07:00
snipe 3d3a4b02fc Added helper method for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:34 -07:00
snipe 2106b64da6 Fixed some layout issues 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:06:49 -07:00
snipe 25f69a7bd2 Added consumable methods for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:28 -07:00
Brady Wetherington 4e5c878b73 Needed to fix the way we write externalId from SCIM 2022-10-31 19:15:08 -07:00
snipe 7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp 
Fixed (?) method name?
 2022-10-26 17:39:11 -07:00
snipe c1eee2cc72 Corrected string for invalid current password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 12:18:29 -07:00
snipe 12c7223bcd Renamed column back to assets_count for legacy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:39:03 -07:00
snipe 28b0d8cf0f Null expected_checkin on user bulk checkin and delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:54:37 -07:00
snipe e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe a94f1c4a64 Cleaned up and added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:15:52 -07:00
Brady Wetherington 1e3281c76c Add externalId support to SCIM integration 2022-10-25 14:19:01 -07:00
snipe 3b16157d6b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 17:43:53 -07:00
snipe 4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
Brady Wetherington bc78d341a0 Caches manager lookups in LDAP for performance boost 2022-10-20 16:52:40 -07:00
Brady Wetherington 12d86bd6e2 Erroneous line-break removal - re-add 2022-10-19 19:01:52 -07:00
Brady Wetherington c4f11de90d Remove incorrect comment. 2022-10-19 18:49:19 -07:00
Brady Wetherington 8fb61cf5f8 Try to better handle LDAP Manager settings that don't line up with what we expect 2022-10-19 18:36:16 -07:00
Godfrey M f2d4a61e3c removes dead space 2022-10-18 15:31:37 -07:00
Godfrey M 3f25a1bf61 removes dead code 2022-10-18 15:25:38 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
Godfrey M d359bcb88d adds proper spacing 2022-10-17 13:15:10 -07:00
Godfrey M 28059c878a gets the proper amount of months and fixes typo of the word depreciation 2022-10-17 11:16:29 -07:00
Phan Nguyen e457b2e98d
Correct assignedusers relation setting 2022-10-17 13:10:09 +07:00
snipe b7bcfaccc9
Merge pull request #11834 from uberbrady/try_catch_notifications 
try/catch wrap notifications on checkin/checkout
 2022-10-13 14:20:22 -07:00
snipe ac055c01dc Use admin ID for audit log notification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 15:59:43 -07:00
snipe 98f2e0271b
Merge pull request #11942 from nh314/develop 
Correct comparison logic
 2022-10-12 10:55:29 -07:00
snipe 0312ecf09d Sets nullable attribute on validation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 10:30:47 -07:00
Phan Nguyen 8ff109e9da
Correct comparison logic 
Comparison operator should be greater than or equal
 2022-10-08 12:54:15 +07:00
snipe 14b7319b63 Added start/end to sortable columns 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:07:07 -07:00
snipe 9d641573b5 Make the APU return null instead of blank 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:01:04 -07:00
snipe bdfac1a345 Added start/end to the users API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:37 -07:00
snipe f7a9be92ca Store data for start and end 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:26 -07:00
snipe 56ba8a7e24 Added API select fields and filters 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:16 -07:00
snipe cf62761d18 Added date casting and fillable to models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:57:59 -07:00
snipe bcebc1e33b Stylistic refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 16:37:33 -07:00
snipe 891b5b2882 Added routes, language 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 15:45:25 -07:00
Ivan Nieto Vivanco 25c10c3819 Filter non-asset items from download unaccepted assets report 2022-10-03 18:12:30 -05:00
snipe b07c4caa37 Extra whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 11:47:27 -07:00
snipe 5a7e35c0e8 Made a conditional escape according to .env 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 09:48:43 -07:00
snipe bae200edd7 Use EscapeFormula() in CSV export 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 09:29:17 -07:00
snipe 36484d50ef Fixed depreciation API call 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 17:07:42 -07:00
Brady Wetherington 420c216973 Added counts to Dashboard Pie Chart legends and tooltips 2022-09-29 13:20:58 -07:00
snipe 70c766e8b3 Added setting to choose dashboard type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 04:16:46 -07:00
snipe 0b2ce7be07 Fixed #11521 - switch to using status meta from status label name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 03:48:58 -07:00
Katharina Drexel 4f5d536e32
Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring. 2022-09-28 14:52:02 +02:00
snipe 055a2f827f
Merge pull request #11872 from sunflowerbofh/tmp-replace-patchwork-utf8 
Fixed #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.
 2022-09-27 16:46:12 -07:00
snipe a7b83fc531
Merge pull request #11854 from inietov/fixes/location_issue_during_import 
Fixed #11847 404 error during Import if a checkout type of location is specified and no checkout location is passed
 2022-09-27 14:34:26 -07:00
Katharina Drexel 8316a4eb92
Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring. 2022-09-26 12:06:06 +02:00
Ivan Nieto Vivanco c0f83a7927 Delete not necessary conditional 2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco 5a1062f0f4 Delete debugging symbols (just kidding, it's just a dd() function) 2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco c32676596c Redirect correctly if not enough license seats exists to be checkout 2022-09-20 18:55:53 -05:00
Ivan Nieto Vivanco e267f5491a Adds a check for empty location values on import 2022-09-19 19:05:48 -05:00
snipe f75d348dc0 Fixed license policy method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:06:46 -07:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:39:47 -07:00
Brady Wetherington 1899e4d1e8 try/catch wrap notifications on checkin/checkout 2022-09-15 13:18:42 -07:00
Ivan Nieto Vivanco 41b75704e3 Removes format when changing to custom fields elements that doesn't need it 2022-09-15 11:21:02 -05:00
snipe ac4f91918e
Merge pull request #11771 from rnelsonee/PAT_test 
Fixed #11769: PAT Test hardcoded text
 2022-09-14 20:01:18 -07:00
snipe 3192a68b06 Pulled assetlog from custom report controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 18:17:52 -07:00
Godfrey M 6b6a079440 fixes current value and monthly depreciation on reports and calculations 2022-09-14 17:01:18 -07:00
Godfrey M a0624fe179 reworks the depreciation formula, includes months passed instead of months remaining 2022-09-14 16:00:21 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco d51eca20f0 Add min_amt field in Consumables and Accessories imports 2022-09-12 18:11:48 -05:00
Godfrey M 28bc97f29f one line away from this being over with 2022-09-12 11:40:16 -07:00
Ivan Nieto Vivanco 3aff97ace1 Remove the previous user hashed password 2022-09-06 18:43:35 -05:00
Rick Nelson 6e82de2f47 Fixed #11769: PAT Test hardcoded text 2022-09-01 11:21:02 -04:00
snipe ae505ef44d Literally have no idea how this ever worked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-31 19:20:35 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -07:00
Godfrey M 70ac8af9c4 . 2022-08-31 09:53:20 -07:00
snipe dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance 
Send notifications when Acceptance Assets actions occur [sc-9917]
 2022-08-30 12:14:58 -07:00
snipe 7fa9214beb
Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering 
Fixed the order expiring assets are listed in notifications
 2022-08-29 12:37:01 -07:00
Godfrey M ea63049b4b removed redundancy with raw query 2022-08-29 12:33:51 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
snipe 9cf5f30c77 Set safeMode to true and use helper for all parsedown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-29 11:26:47 -07:00
snipe 96ec96ff7f
Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule 
Fixed Validation error when empty default customfield values
 2022-08-25 17:54:04 -07:00
Ivan Nieto Vivanco 0d4e9c183b Save correct id in action log if the bulk-checkin is of type license 2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco 1ff2d15c4a Replace 'required' rule with 'nullable' to allow blank default customfields values 2022-08-25 18:16:50 -05:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
snipe 482a7b2a3a
Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500 
Fixed 500 error when sending unaccepted assets reminder
 2022-08-25 14:00:00 -07:00
snipe 6f0f6c8042 Don’t prevent deletion if user has consumables checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:51:02 -07:00
snipe 6fde72a693 Log user out of other devices when they change their password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:24:26 -07:00
snipe 2ad9c39090
Merge pull request #11730 from inietov/fixes/importing_licenses_field_mismatch 
Fixed #11679 Importing Licenses - Field Mismatch
 2022-08-24 17:31:12 -07:00
Ivan Nieto Vivanco c59fd7b8da Fix importer field mapping for command line 2022-08-24 19:20:23 -05:00
Ivan Nieto Vivanco 6e85c2e5cb Delete unused import 2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco 30d0125cbd Remove the rule 'required' for default values, if custom field is obligatory 2022-08-24 16:18:11 -05:00
snipe 45f17fea8a
Merge pull request #11510 from sunflowerbofh/tmp-ldap 
Fixed #11509 allow-ldap-anonymous-bind
 2022-08-22 16:32:07 -07:00
snipe 3ac84eab58
Merge pull request #11651 from inietov/fixes/activity_report_search 
Fixed Search in activity report for full name in relation
 2022-08-22 16:23:50 -07:00
snipe 906a36dc1a
Merge pull request #11703 from julian-piehl/fixes/wrong-trans-string 
Fixed Translation String: wrong key at request canceled message
 2022-08-22 16:16:10 -07:00
Warren White ba7d6dde3f Fixed #11706: changes the display of managers username to First Last name 2022-08-19 10:17:25 -07:00
Warren White 4b9a91f55b Fixed #10565, #11086: correctly looks up Manager DN from AD Manager attribute and sets manager id 2022-08-19 09:09:03 -07:00
Peace 94bbf2bf2f fixed translation string for canceled requests 2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco e5cc6ec972 Fixes error 500 if checkout_acceptances table have a created_at null column 2022-08-17 22:02:13 -05:00
snipe 91e824c5b0 Check for nullifying checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:25:07 -07:00
Ivan Nieto Vivanco a33ca39237 Figure out declined notifications 2022-08-11 16:00:21 -05:00
Ivan Nieto Vivanco 98bcd82108 Add the mail recipient from configuration in the CheckoutAcceptance model 2022-08-11 15:33:18 -05:00
Ivan Nieto Vivanco d2c486bb1e Create the mail template for the acceptance 2022-08-11 15:28:30 -05:00
Godfrey M 814992eb7d allows company and location ids to be null 2022-08-11 12:47:40 -07:00
Ivan Nieto Vivanco 267997f0a6 Customize the notifications with the needed data 2022-08-11 14:01:11 -05:00
Ivan Nieto Vivanco 0172fe6403 Add Notifiable trait to the CheckoutAcceptance Model 2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco 509bbbc685 Create Notifications classes for accepted and declined and add some necesary lang strings 2022-08-11 13:01:21 -05:00
Ivan Nieto Vivanco 8cee5060af Remove unused DB statement 2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco a7de97f060 Found a better place for the where condition 2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco c1074000f9 Add a concat to search for full name when the relationship search in the users table 2022-08-10 18:27:28 -05:00
snipe ef099aa644 Reverted notes to note since pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 16:09:56 -07:00
snipe acd666fdf5 Added notes to user consumables tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:34:07 -07:00
snipe 512348cc5a Added withInput() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:09 -07:00
snipe e3293151a2 Added note on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:59 -07:00
snipe 3ec77724d8 Added note pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:34 -07:00
snipe 024a014298 Changed notes to note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:19 -07:00
snipe c1e5d03340 Added pivot for note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:41 -07:00
snipe e7c47408a7 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:57:42 -07:00