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

10886 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 9591442f1e Evaluate the radio input to update location only or default location too 2023-07-06 10:46:21 -06:00
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
snipe f7f2d799f2
Merge pull request #13223 from inietov/fixes/delete_notes_map_from_asset_importer 
Delete notes column map from assets importer
 2023-06-28 20:06:33 +01:00
Ivan Nieto Vivanco a4b8723dcb Delete notes column map from assets importer 2023-06-28 11:38:51 -06:00
snipe 161f4c8d83
Merge pull request #13045 from akemidx/feature/sc-23261 
Checkin/out info on side bar
 2023-06-28 16:41:21 +01: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
snipe e3f381a1e1
Merge pull request #13212 from marcusmoore/feature/sc-23419 
Allow running tests in parallel
 2023-06-28 15:12:13 +01:00
snipe a455f67d62
Merge pull request #13216 from marcusmoore/bug/sc-23420 
Fix translation string in user importer
 2023-06-28 07:03:11 +01:00
snipe b6a11cde65
Merge pull request #13218 from marcusmoore/chore/sc-23424 
Have ChipperCI run on each PR
 2023-06-28 07:01:14 +01:00
snipe a8d4494e68
Merge pull request #13220 from marcusmoore/bug/sc-23425 
Add missing relationship check in Asset Transformer
 2023-06-28 06:59:33 +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 6df7be8c13
Have ChipperCI run on each PR 2023-06-27 16:55:20 -07:00
Marcus Moore b0177d513a
Fix translation 2023-06-27 12:37:19 -07:00
Marcus Moore 3f09e6017b
Install paratest to allow for parallel test running 2023-06-26 16:22:28 -07:00
Marcus Moore 2abdb8a5fd
Revert unneeded changes 2023-06-26 14:01:09 -07:00
Marcus Moore 7cb22d3d49
Remove incomplete tests 2023-06-26 14:00:53 -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 49b50d81ee
Merge pull request #13200 from snipe/bug/sc-23417 
Set table alias for model number sort scope
 2023-06-26 08:29:16 +01: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
Marcus Moore acd06927ac
Add helper method for authenticating with passport 2023-06-22 17:37:30 -07:00
Marcus Moore a35d83d14a
Migrate to response macros for readability 2023-06-22 14:41:56 -07: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 a333d7b72f
Add context to incomplete tests 2023-06-22 12:48:09 -07:00
Marcus Moore ab5fed09db
Remove scopeCompanyables call from AssetsController@requestable 2023-06-22 12:36:43 -07:00
Marcus Moore 74b072f1b5
Improve messaging in testing helper 2023-06-22 12:36:30 -07:00
Marcus Moore 0a5e1e3190
Remove scopeCompanyables call from AssetsController@selectlist 2023-06-21 17:21:36 -07:00
Marcus Moore effd969284
Scaffold test before removing scopeCompanyables call from AssetsController@selectlist 2023-06-21 17:15:02 -07:00
Marcus Moore fd55c99b87
Remove scopeCompanyables call from AssetsController@index 2023-06-21 16:29:44 -07:00
Marcus Moore af77fefc61
Scaffold test before removing scopeCompanyables call from AssetsController 2023-06-21 16:19:56 -07:00
Marcus Moore 65e8e4e163
Guard against attempting to use invalid property 2023-06-21 16:18:09 -07:00
snipe 17a10a4342 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-21 19:06:21 +01: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 7a425f8a49
Merge pull request #13093 from NojoudAlshehri/features/added_asset_tag_colum_in_requestable_assets 
feature: Added asset_tag column in requestable assets page
 2023-06-15 19:37:18 +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 09d65f810e
Merge pull request #13124 from m4us1ne/fix_dompdf_chroot 
Fixed #12434: Include Docker Specific Paths for dompdf chroot
 2023-06-15 19:32:34 +01:00
snipe 004992086e
Merge pull request #13098 from ak-piracha/feature/snipe-13049-status-label-chart-color 
Fixed #13098: Status Label Chart Color, resets to default when editing a Status Label
 2023-06-15 16:55:32 +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