DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 16:57:38 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11891 commits 89 branches 265 tags 290 MiB
Commit graph

11891 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 1da6b6a4d5 Merge remote-tracking branch 'origin/develop' 2023-10-30 13:06:50 +00:00
snipe 740569791f
Merge pull request #13803 from spencerrlongg/feature/13789-feature-request-add-user-phone-and-address-to-custom-asset-report 
Added User Phone & Address Fields to Custom Asset Report
 2023-10-30 12:43:20 +00:00
spencerrlongg 90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
snipe b58dea07a7 Merge remote-tracking branch 'origin/develop' 2023-10-26 21:46:45 +01:00
snipe 10abecc5a6
Merge pull request #13802 from spencerrlongg/bug/13531-custom-asset-report-does-not-correct-report-eol-date 
Fixes EOL on Custom Report
 2023-10-26 21:43:13 +01:00
spencerrlongg f12d44509e asset_eol_date should always be filled now 2023-10-26 14:39:02 -05:00
spencerrlongg 91b53bffa1 resolved 2023-10-26 14:23:31 -05:00
snipe 98423e4dd9 Merge remote-tracking branch 'origin/develop' 2023-10-26 17:57:17 +01:00
snipe a2ba39c837 Removed required custom field from seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 17:57:05 +01:00
snipe 38f10e0b21 Merge remote-tracking branch 'origin/develop' 2023-10-26 16:00:22 +01:00
snipe aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets 
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
 2023-10-26 15:56:47 +01:00
snipe 7b2f49644e Use nothing instead of null to make it consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:44:17 +01:00
snipe 305cd9b0b8 Use null instead of blank 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:42:49 +01:00
snipe 9bba0b764a Added clearer comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:38:39 +01:00
snipe 1ce95b6eac Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:27 +01:00
snipe 9c90f03142 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:18 +01:00
snipe b4d3f51414
Merge pull request #13776 from Robert-Azelis/Robert-Azelis-EOL_fix_improvements 
[FIX and improvements] EOL rate and EOL date
 2023-10-26 13:36:25 +01:00
snipe 64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements 2023-10-26 13:36:18 +01:00
snipe 7b9259274c
Merge pull request #13799 from inietov/fixes/unlogged_checkin_from_importer 
Fixed #13795 Unlogged checkin action post updating the username of an asset through the CSV import
 2023-10-26 13:33:51 +01:00
snipe d40a03b4c5 Merge remote-tracking branch 'origin/develop' 2023-10-26 13:09:38 +01:00
snipe c1213e0abc Nicer handling for empty custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:41:44 +01:00
snipe 05de8a5731 Re-added missing break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:21:27 +01:00
snipe ff72c4fbaa Added nicer formatting for fields in log meta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:17:28 +01:00
snipe 9d887484c8 Added encrypted custom field to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 07:41:25 +01:00
snipe c4c47f2e8d Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:51:14 +01:00
snipe 0cebccac95 Removed extra logging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:51:07 +01:00
snipe c3b3aa4de6 Set one field to encrypted in the seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:25:51 +01:00
snipe 3717d60170 Added two more custom fields/fieldsets to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 05:04:30 +01:00
snipe 6c996ac8fa Changed the seeder order to accomodate actionlog factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 05:03:59 +01:00
snipe 7042260871 More style polishing on custom fields in bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:23:11 +01:00
snipe 2695576968 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:21:20 +01:00
snipe f25ddee857 Removed debugging, use new model rules if model has changed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:21:14 +01:00
snipe 541ba0c0ba Removed conditional add for model_id 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:20:52 +01:00
snipe 77d141d19c Don’t check the delete expected checkin by detault 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 03:56:02 +01:00
snipe 436192b836 Fixed seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:56:34 +01:00
snipe 522aa96fcc Changed error variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:36:18 +01:00
snipe b87879f8e7 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:35:53 +01:00
snipe 60e0e899bc Added show_in_requestable_list to factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:35:33 +01:00
snipe 6ebc01ca50 Bulk edit refactor 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:23 +01:00
snipe 4b6b36c639 Removed semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:14 +01:00
snipe 4a759f0a20 Added fingerprint icon for unique 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:01 +01:00
Ivan Nieto Vivanco ca1845efd7 Only log checkin event if the assigned_to property is not empty 2023-10-25 16:41:31 -06:00
Ivan Nieto Vivanco 7ed58a177b Evaluate if the asset was assigned to a different user than current target to log a checkin event 2023-10-25 16:31:23 -06:00
snipe d8a3081128 Merge remote-tracking branch 'origin/develop' 2023-10-25 21:05:28 +01:00
snipe d93e399295
Merge pull request #13797 from Godmartinz/employeeid_search_add 
adds employee number as a searchable field to the asset table
 2023-10-25 21:04:54 +01:00
Godfrey M 1b614c13fb ugh 2023-10-25 13:03:42 -07:00
Godfrey M 56fd41eee4 removed erroneous code 2023-10-25 13:03:12 -07:00
Godfrey M 33b45898b1 adds to advancedsearch 2023-10-25 12:59:58 -07:00
snipe eabc7479e3 Merge remote-tracking branch 'origin/develop' 2023-10-25 20:58:13 +01:00
snipe 7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880 
Added optional custom fields to requestable assets page
 2023-10-25 20:57:54 +01:00