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
11367 commits 97 branches 266 tags 291 MiB
Commit graph

994 commits

Author SHA1 Message Date
johnson-yi 5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog 2023-09-06 00:36:48 +00:00
snipe d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog 
Added/Fixed: track changes on asset checkin/out
 2023-09-05 19:08:49 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
Johnson Yi 09f7b3debe Track changes on asset checkin/out 2023-09-01 13:12:07 +10:00
snipe 663faffcc1 Un-cast byod, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 19:13:55 +01:00
snipe 2a93c38830 Don’t cast as boolean, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 16:40:28 +01:00
snipe a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue 
Fixed #13317 Accessories declined by user remain assigned
 2023-08-22 12:42:55 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields 
Bulk Editing Custom Fields
 2023-08-22 12:40:18 +01:00
snipe 354550b52e Removed getCompleteNameAttribute(), modified getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:17 +01:00
Marcus Moore 489d30c685 Set last_checkin in ui and api controllers 2023-08-21 11:57:33 -07:00
snipe 45898deb1a Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:38 +01:00
snipe d12f4564e1 Added Dymo Labelwriter template 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:44:12 +01:00
snipe d56c671410 Removed the black label from around the default labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:39:00 +01:00
snipe 0cb76a049a Make sure the columns and rows can never be 0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:13:16 +01:00
Ivan Nieto Vivanco b607a59875 Add query to search default locations in advanced search 2023-08-16 15:04:17 -06:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
Ivan Nieto Vivanco 96440834bd Move the declinedCheckout function so it don/'t separate the class properties 2023-08-14 16:16:28 -06:00
Ivan Nieto Vivanco 4796598bb6 Add declinedCheckout method to Accessory model 2023-08-14 14:35:31 -06:00
Robert-Azelis bbb8ecfee4
Update Company.php 2023-08-13 17:21:55 +02:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
snipe 540b09c506 Possible alternative to fixing #13296 - custom report failing when the model is busted 
Related: https://github.com/snipe/snipe-it/pull/13297
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 17:45:45 +01:00
snipe 1e09320ebe Check that $this->get_depreciation() returns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 16:30:07 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe 981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags 
Better auto increment asset-tags [FD-32892]
 2023-07-13 09:49:44 +01:00
Brady Wetherington 76191a09ed Improvements to asset_tag auto-incrementing, with auto-fixups for gaps 2023-07-12 16:39:45 +01:00
snipe ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations 
Added phone, fax to departments, locations, companies
 2023-07-11 11:15:13 +01:00
Ivan Nieto Vivanco ec8cb1b09e Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash 2023-07-10 16:34:00 -06:00
snipe 14c61e4c17 Added phone, fax to departments, locations, companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:44:21 +01:00
snipe bcefe73c9c Use proper alias for table scope 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 16:52:09 +01:00
snipe a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset 
Cancel requested assets without checkin/out [ch-17606]
 2023-06-29 16:18:13 +01:00
Ivan Nieto Vivanco eb4d764601 Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want 2023-06-27 17:13:11 -06:00
slong753 2a352619f7 clean up 2023-06-26 16:25:48 -05:00
Godfrey M 114d946437 adds half_year fix from jdickerson71388 2023-06-26 11:26:46 -07:00
snipe 4f7b2836b5 Set table alias for model number sort scope 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-26 08:27:17 +01:00
Spencer Long f646623a5e
Merge branch 'develop' into bulk_edit_custom_fields 2023-06-22 18:00:31 -05:00
Ivan Nieto Vivanco f9a20bc917 Replace join with left join in pertinent eloquent query 2023-06-01 12:08:51 -06:00
snipe e431cd5146
Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value 
Fixed #12978 Custom Field Checkboxes not holding assigned values
 2023-05-31 10:55:37 -04:00
ak-piracha 1cdf089306 Fixes: issue #13073: deleted component addearing in asset component tab fixed 2023-05-31 00:11:11 +09:30
Ivan Nieto Vivanco f4947bfa93 Use trim() function when format the custom field values as array 2023-05-24 04:06:31 -06:00
Marcus Moore 0a3d46824e
Automatically add table prefixes when building multi-column search string 2023-05-23 15:58:58 -07:00
Marcus Moore b2b6f0cf96
Use new dynamic scope where possible 2023-05-23 13:38:50 -07:00
Marcus Moore 054d71aedc
Add docblock 2023-05-23 13:37:04 -07:00
Marcus Moore 9078d4c71c
Add dynamic scope for prettier multiple column search 2023-05-23 13:35:19 -07:00
Marcus Moore 05a2e568d7
Add comment 2023-05-23 11:37:09 -07:00
Marcus Moore f40e722397
Add docblock 2023-05-22 17:44:17 -07:00
Marcus Moore 9b512648a3
Update searchRelations in Searchable trait 2023-05-22 17:33:19 -07:00
Marcus Moore 64e83ed9f5
Update scopeAssignedSearch in Asset 2023-05-22 16:54:54 -07:00
Marcus Moore 2d86c8f030
Update advancedTextSearch methods in Asset and User models 2023-05-18 17:06:41 -07:00