lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
10885 commits 1 branch 0 tags 220 MiB
Commit graph

4288 commits

Author SHA1 Message Date
Ivan Nieto Vivanco
743e852998 Add radio buttons to alter asset checkin location behavior 2023-07-06 10:38:48 -06:00
Ivan Nieto Vivanco
011726154c Set rtd_location if a location is given at checkin 2023-06-29 03:16:59 -06:00
Ivan Nieto Vivanco
a4b8723dcb Delete notes column map from assets importer 2023-06-28 11:38:51 -06:00
snipe
e1fdfd01f6
Merge pull request #13211 from marcusmoore/company-scoping 
Improve testing around company scoping
 2023-06-28 16:17:07 +01:00
snipe
4278471d81
Merge pull request #13207 from Godmartinz/half_year_dep_fix 
adds half_year fix from jdickerson71388
 2023-06-28 15:12:30 +01:00
Marcus Moore
ab51857854
Check to see if model relationship exists before using it 2023-06-27 19:35:55 -07:00
Marcus Moore
3cb0920411
Merge branch 'develop' into company-scoping 2023-06-26 12:32:10 -07: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
snipe
8c6bde335e
Merge pull request #13196 from inietov/fixes/default_status_labels_when_import 
Fixed issue when importing Assets and no status labels exists [sc-23359]
 2023-06-22 21:34:25 +01:00
snipe
b2d74f7e95
Merge pull request #13186 from snipe/bug/sc-23386 
Moved logic for tighter constraints when ids are passed
 2023-06-22 21:32:36 +01:00
snipe
78d8e32a22 Fixed weird order number thing 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-22 21:16:24 +01:00
snipe
4029efebfd
Merge pull request #13159 from Godmartinz/audit_image_bug 
fixed audit log image not appearing
 2023-06-22 21:11:39 +01:00
Marcus Moore
8aae5beaba
Add explicit select back to query 2023-06-22 13:09:08 -07:00
Marcus Moore
a8133f62e8
Add explicit select back to query 2023-06-22 13:07:49 -07:00
Ivan Nieto Vivanco
67e47a7d8b Add guard clause to obtain the default ID of imported asset's status label 2023-06-22 13:53:58 -06:00
Marcus Moore
ab5fed09db
Remove scopeCompanyables call from AssetsController@requestable 2023-06-22 12:36:43 -07:00
Marcus Moore
0a5e1e3190
Remove scopeCompanyables call from AssetsController@selectlist 2023-06-21 17:21:36 -07:00
Marcus Moore
fd55c99b87
Remove scopeCompanyables call from AssetsController@index 2023-06-21 16:29:44 -07:00
snipe
5d4e704fac Added a comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-21 09:26:54 +01:00
snipe
2d9ddab3f0 Moved logic for tighter constraints when ids are passed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-21 09:24:17 +01:00
snipe
f890e1f8b1
Merge pull request #13171 from snipe/features/importer/allow_update_by_user_id 
Accept user ID as authoratative field for updates
 2023-06-15 20:08:20 +01:00
snipe
21a27f43a9
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug 
Added warranty confirmation to asset maintenance table
 2023-06-15 19:34:16 +01:00
snipe
6c684bccd0 Accept user ID as authoratative field for updates 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-15 10:02:05 +01:00
Godfrey M
ee50906e44 attempt to add warranty to api controller 2023-06-13 11:20:55 -07:00
snipe
157a4341ea
Merge pull request #13041 from snipe/features/refactor_importer_for_localization 
Refactor importer for localization
 2023-06-13 18:12:07 +01:00
Godfrey M
fc86530c94 uses the trueFalseFormatter now 2023-06-13 09:10:42 -07:00
Godfrey M
6dd7181d09 fixed audit log image not appearing 2023-06-12 12:10:19 -07:00
Godfrey M
69325beddb adds warranty confirmation to asset maintenance table 2023-06-12 11:03:32 -07:00
Marcus Moore
8e6e525b47
Remove scopeCompanyables call from LicensesController 2023-06-07 16:09:45 -07:00
Marcus Moore
a18f5e7fc0
Remove scopeCompanyables call from ConsumablesController 2023-06-07 14:22:22 -07:00
snipe
b57730ee9d Added missing assets_fields declaration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-07 15:52:18 +01:00
Marcus Moore
48850f3597
Remove scopeCompanyables call from ComponentsController 2023-06-06 18:02:18 -07:00
Stefan Stidl
ad8c36a51a fix: slack channel 2023-06-06 10:30:01 +02:00
snipe
7ae260b489 More license translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-01 19:51:06 +01: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
snipe
5e96fd200f Refactor to remove general_fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 20:31:53 -07:00
snipe
3ef081e739 Indenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:28:42 -07:00
snipe
47fa490e8a More translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:28:23 -07:00
snipe
55683c29dc Removed method that does the same return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:22:00 -07:00
snipe
f355a6e9e1 Added first name and last name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:21:31 -07:00
snipe
3e4426c68c Clearer comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:20:52 -07:00
snipe
2e5486a62e
Merge pull request #13076 from marcusmoore/fixes/allow-multi-column-search-in-sqlite 
Dynamically adapt concatenation searches for MySQL and sqlite
 2023-05-23 16:27:12 -07:00
Marcus Moore
0a3d46824e
Automatically add table prefixes when building multi-column search string 2023-05-23 15:58:58 -07:00
snipe
61d5bd8567 Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 14:57:15 -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