DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
11616 commits 101 branches 268 tags 320 MiB
Commit graph

1020 commits

Author SHA1 Message Date
Marcus Moore e82fec2a5f Grammar fix 2023-10-02 16:19:20 -07:00
Marcus Moore db4c86a4f4 Filter null field options before attempting to process them 2023-10-02 16:14:20 -07:00
Marcus Moore 724c054838 Log non-compliant barcode error as debug message 2023-10-02 12:06:24 -07:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2 
Standardize Asset EOL Date
 2023-10-02 16:09:22 +01:00
snipe 0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778 
Fixed uncaught type error when attempting to render barcodes with invalid characters
 2023-09-29 01:50:07 +01:00
Marcus Moore bed1055c4e Catch TypeError when rendering 1d barcode 2023-09-28 17:32:16 -07:00
spencerrlongg 4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
spencerrlongg c48a47936c add validation back in 2023-09-20 14:00:59 -05:00
spencerrlongg 6b4f8f1813 rm duplicate fillable 2023-09-19 18:07:15 -05:00
spencerrlongg 929e107a20 rm byod from casts 2023-09-19 18:04:16 -05:00
snipe 2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled 
Fixed #13336 - Save unhashed password if no password provided
 2023-09-14 14:15:53 +01:00
snipe dcae5503c8 Use $attributes array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 13:52:57 +01:00
snipe d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping 
Added `CompanyableTrait` to `Department` model
 2023-09-14 12:52:53 +01:00
spencerrlongg 7047869367 cleanup 2023-09-12 18:03:13 -05:00
spencerrlongg fb001caee4 fix conflicts 2023-09-11 17:33:31 -05:00
slong753 75d7e3e1a0 fix conflicts 2023-09-11 17:20:21 -05:00
slong753 774f21bb7f some more cleanup 2023-09-11 17:17:59 -05:00
slong753 20367eecc9 fix conflicts 2023-09-11 17:17:59 -05:00
slong753 c1daabef08 progress 2023-09-11 17:10:41 -05:00
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
Ivan Nieto Vivanco 1509c512a5 Add guard clauses around some License and LicenseSeat models functions 2023-09-06 11:54:11 -06:00
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 18ff810d7e Reverse orderof parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:51:52 +01:00
snipe baffcbad71 Set password property properly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:47:56 +01:00
Godfrey M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30:07 -07: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
Marcus Moore f7b2075e9e
Add CompanyableTrait to Department 2023-08-07 16:54:02 -07: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 b54e7dc3ee Fixed #13336 - Save unhashed password if no password provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 17:44:40 +01:00