DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
10843 commits 95 branches 267 tags 295 MiB
Commit graph

10843 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 13e8f91a59 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-29 18:18:46 -04:00
ak-piracha 825a9a384d Fixed 2023-05-29 14:07:53 +09:30
NojoudAlshehri 980cb53efa
Added asset_tag column in requestable assets page 2023-05-27 07:05:59 +07:00
snipe 60d2046b6d Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:13:33 -07:00
snipe 67e0eb3193
Merge pull request #13046 from Godmartinz/asset_info_overflow 
Added Asset info overflow-wrap
 2023-05-24 16:13:01 -07:00
snipe 44cbb0c2e9
Merge branch 'develop' into asset_info_overflow 2023-05-24 16:11:34 -07:00
snipe fb5e33c50f Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:03:15 -07:00
snipe d7f4fa146b Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:28 -07:00
snipe 064dbdd3d4 Fixed missing brace from conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:23 -07:00
snipe cc07921608 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 15:59:52 -07:00
snipe 267a0ffc59
Merge pull request #13077 from Godmartinz/fix_unclickable_nav_bar_and_notifcation_block 
fixes mobile nav bar and notification position
 2023-05-24 15:58:27 -07:00
snipe 9086cb5310
Merge branch 'develop' into fix_unclickable_nav_bar_and_notifcation_block 2023-05-24 15:56:01 -07:00
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 d020825a17 Renamed import samples 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:31:42 -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 01768bf649 Renamed sample csv 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:23:29 -07:00
snipe 52cf54d211 New assets CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:22:08 -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 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