DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 18:44:10 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12647 commits 96 branches 267 tags 296 MiB
Commit graph

12647 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d0f5a044ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:13:06 -07:00
Marcus Moore 05a2e568d7
Add comment 2023-05-23 11:37:09 -07:00
snipe fbed18a984
Merge pull request #13075 from inietov/fixes/api_incorrect_remaining_accessories 
Fixed #13074 [API] Remaining accessories quantity not correct
 2023-05-23 11:08:37 -07:00
Ivan Nieto Vivanco 086265455d Pass user count to the eloquent query 2023-05-23 11:53:09 -06:00
Marcus Moore f40e722397
Add docblock 2023-05-22 17:44:17 -07:00
Marcus Moore 50234bc9a5
Formatting 2023-05-22 17:40:06 -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
snipe 0c7acd6a3b
Merge pull request #13070 from inietov/fixes/accessory_image_shown_when_disabled 
Fixed #12947 Accessory image in checkin email when Show images in emails is disabled
 2023-05-22 15:30:14 -07:00
Ivan Nieto Vivanco 6df9a33eab Add a condition to check if images should be shown in notification 2023-05-22 16:24:16 -06:00
snipe f9449aa81f
Merge pull request #13069 from marcusmoore/fixes/add-eager-load-to-asset-model-endpoint 
Add eager loading to Asset Models controller
 2023-05-22 14:39:32 -07:00
Marcus Moore a6eeae6541
Eager load fieldset default values in asset model endpoint 2023-05-22 14:19:03 -07:00
snipe b2d922f127 New user import sample CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-22 13:20:20 -07:00
snipe 96e86501ad Additional alias fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-22 13:20:08 -07:00
snipe 4dfe6f0a28 Added gravatar, avatar, start_date and end_date to user importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-22 13:19:57 -07:00
snipe 511d83cc47 Added/fixed a few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:52:42 -07:00
snipe 2171d8c83c Removed requestable field in sample consumable CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:52:28 -07:00
snipe 0ea29a0224 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:21:36 -07:00
snipe 18bedb736e Removed item number, since not everything will have it 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:21:29 -07:00
snipe 1396e314c4 Updated arrays with translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:21:13 -07:00
snipe b75109dcac Added component mapping switch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:20:49 -07:00
snipe b7149d8339 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:20:38 -07:00
Marcus Moore 2d86c8f030
Update advancedTextSearch methods in Asset and User models 2023-05-18 17:06:41 -07:00
Marcus Moore 3a9670930d
Define required fields in Custom Field seeder so sqlite can be seeded 2023-05-18 13:17:35 -07:00
Marcus Moore 85974c7f65
Apply formatting 2023-05-18 13:16:52 -07:00
Marcus Moore ffbde46180
Simplify sqlite query 2023-05-18 13:06:50 -07:00
Marcus Moore d8d672c4c1
Move multiple column search function to Searchable trait 2023-05-18 13:05:40 -07:00
Marcus Moore 9cb0decf35
Adapt multiple column search based on database driver 2023-05-18 12:54:00 -07:00
Godfrey M 608d07d03c adds overflow-wrap to asset info table 2023-05-17 13:08:53 -07:00
Godfrey M addd806653 testing overflow solutions 2023-05-17 10:47:50 -07:00
Godfrey M fe60309dfd adds padding to multi select2 inputs 2023-05-17 10:19:25 -07:00
akemidx deca80ba71 checkin/out info on side bar 2023-05-17 13:17:48 -04:00
Godfrey M 448472b6d3 testing input paddings 2023-05-17 09:45:45 -07:00
snipe f1b4bba3ae Merge remote-tracking branch 'origin/develop' 2023-05-16 23:12:41 -07:00
snipe 2c4c9a16c9 Refactored the static arrays into mount arrays for translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:31:58 -07:00
snipe d228b7f347 Remove 99% of the defaultMap stuff (might pull all of this later) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:31:01 -07:00
snipe 7012018e22 Removed todo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:30:17 -07:00
snipe 13c6a7f89b
Merge pull request #13039 from snipe/features/add_eol_date_to_importer 
Added EOL date to importer
 2023-05-16 20:12:10 -07:00
snipe 3296716dfa Added EOL date to importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 19:06:35 -07:00
snipe dbae01f545 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/mix-manifest.json
 2023-05-16 17:41:39 -07:00
snipe c4876865cf Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 17:36:58 -07:00
snipe 3cbb4620c3
Merge pull request #13008 from Godmartinz/importer_happy_changes 
Added standardized colors to the importer
 2023-05-16 17:26:32 -07:00
snipe 5a1e6c8e29
Merge pull request #13003 from marcusmoore/chipper-config-updates 
Disable browser tests in ChipperCI
 2023-05-16 17:26:09 -07:00
snipe f1575d2020
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif 
adds translation to checkout notification
 2023-05-16 17:25:50 -07:00
snipe 71234228b4
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to 
removes assigned_to if archived
 2023-05-16 17:25:24 -07:00
snipe 5be993df8d Merge remote-tracking branch 'origin/develop' 2023-05-16 16:42:17 -07:00
snipe 4ca914d773
Merge pull request #13038 from uberbrady/fix_asset_checkout_on_update 
Importer fix for non-Location imports
 2023-05-16 16:41:27 -07:00
Brady Wetherington 2eb34d423f Importer fix for non-Location imports 2023-05-16 16:33:07 -07:00
snipe 37f75c5001 Merge remote-tracking branch 'origin/develop' 2023-05-16 16:29:36 -07:00
snipe b9b9eb86d9
Merge pull request #13036 from snipe/features/multiselect_locations_custom_report 
Added multi-select option for location, more to custom report
 2023-05-16 16:29:13 -07:00