DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10972 commits 101 branches 268 tags 288 MiB
Commit graph

10972 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 f69caf77e5 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 14:57:57 -07:00
snipe 61d5bd8567 Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 14:57:15 -07:00
snipe 80e8022c76
Merge pull request #13044 from Godmartinz/bug/sc-23260_multi_select_example_text 
Bug/sc 23260 multi select example text
 2023-05-23 14:45:55 -07:00
Marcus Moore 6300909fee
Add test for searching for user's first and last name 2023-05-23 13:39:01 -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
Marcus Moore 9078d4c71c
Add dynamic scope for prettier multiple column search 2023-05-23 13:35:19 -07:00
snipe d4c5a4eb2e More aliases 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 13:18:32 -07:00
snipe 35794c8ba2 More translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:57:48 -07:00
snipe 62384260bc Clarifying comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:57:40 -07:00
snipe f2e9b41199 More user fields in asset importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:57:34 -07:00
snipe 479350ed7b Removed unneeded mapping file 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:57:24 -07:00
Godfrey M 68a43cb590 fixes mobile nav bar and notification position 2023-05-23 12:43:32 -07:00
snipe 809dcdc50c Updated CSVs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:13:17 -07:00
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 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