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

13761 commits

This branch
This branch
All branches
Author SHA1 Message Date
spencerrlongg b6fa6cba22 note before switching tasks 2024-02-22 15:01:14 -06:00
Marcus Moore 2df026bcb5
Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
Godfrey M 6ee24a7527 remove unnecessary code reformat 2024-02-22 12:36:27 -08:00
Godfrey M e2dcee1959 cleans up dead code 2024-02-22 12:26:57 -08:00
Godfrey M 4fbea9512f puts textY inside of the forloop 2024-02-22 12:08:47 -08:00
Godfrey M b7850ab839 puts textY outside of the forloop 2024-02-22 12:08:04 -08:00
Godfrey M c0215baca5 minor changes 2024-02-22 11:41:04 -08:00
Godfrey M c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
spencerrlongg 14358651e4 pushing to test other branches 2024-02-22 13:28:23 -06:00
snipe f04aeb9f2b Fixed spacing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:31:02 +00:00
snipe dc902e7a5a Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:30:23 +00:00
snipe 4fc66e19bb Check for activeFile before trying to get header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:28:01 +00:00
snipe e12d2b2a42
Merge pull request #14317 from snipe/fixes/make_website_searchable_on_users_list 
Made website searchable on users table
 2024-02-22 17:01:58 +00:00
snipe cb78451d6c Made website searchable on users table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 16:13:54 +00:00
snipe 7979bc63ae
Merge pull request #14316 from snipe/feature/sc-24871 
Added email, phone icons
 2024-02-22 14:50:46 +00:00
snipe e8ad8a7448 Added email, phone icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 14:48:01 +00:00
snipe eb61f5aa9e
Merge pull request #14315 from snipe/fixes/rb-3565 
Only send notification if the item is assigned to a person
 2024-02-22 12:05:59 +00:00
snipe 3351998efd Only send notification if the item is assigned to a person 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 12:03:07 +00:00
spencerrlongg 20dbacd22f store good, update needs work 2024-02-21 21:33:34 -06:00
akemidx 0f3be4fdf8 adding in eula pdf dl link. mimics activity log 2024-02-21 17:45:10 -05:00
Marcus Moore 3ae8adfbf9
Remove incomplete flag on test case 2024-02-21 12:33:32 -08:00
Marcus Moore aa2632fe46
Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
Brady Wetherington 8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10 
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
 2024-02-21 20:22:28 +00:00
Godfrey M 14c86d447b added filter to collectifunction 2024-02-21 11:38:03 -08:00
Godfrey M bee016e0be keeps example values in the example preview, fixes indent 2024-02-21 09:31:01 -08:00
snipe 54552fc95c
Merge pull request #14192 from inietov/fixes/api_issue_checkin_licenses 
Fixed #14183  API /hardware/:id/checkin doesn't return Licenses
 2024-02-21 11:35:06 +00:00
akemidx 9397372f87 permissions, but they are now all in their own column because reasons??? 2024-02-20 18:48:17 -05:00
akemidx 8bbf6da052 user block, trying to pick out ONLY permissions we wanna see 2024-02-20 18:25:41 -05:00
snipe ffa7d25fc0
Merge pull request #14308 from snipe/fixes/eager_load_relations_on_locations 
Eager load relations to determine deletability on locations
 2024-02-20 22:28:39 +00:00
snipe a37d3b00d0
Merge pull request #14307 from marcusmoore/bug/sc-24867 
Fixed title not appearing in new label engine
 2024-02-20 22:25:45 +00:00
snipe 04891c7c61 Eager load relations to determine 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 22:25:00 +00:00
spencerrlongg d67ff54f4b temporary decrypt, almost there 2024-02-20 16:20:03 -06:00
Marcus Moore ccec190985
Set label title properly 2024-02-20 13:59:50 -08:00
spencerrlongg 26728a85ad this seems to work for patches 2024-02-20 13:18:40 -06:00
spencerrlongg c6d85a1b0b allows arrays on checkbox values 2024-02-20 12:23:24 -06:00
snipe 71610fb20f
Merge pull request #14304 from snipe/feature/sc-24018 
Added ability to bulk delete locations
 2024-02-20 18:14:51 +00:00
snipe cb0f9024b1 Fixed gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:56:40 +00:00
snipe 1797480128 Few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:56 +00:00
snipe 972b198248 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:16 +00:00
snipe 9010b7acd0 Use isDeletable instead of asset count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:10 +00:00
snipe b57b68571e Added blade views 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:44:45 +00:00
snipe 1ca9420baa Fixed incorrect gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:44:29 +00:00
snipe 0383938536 API-ify the managed locations tab in user view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:44:20 +00:00
snipe 50b841d54d Added table data-dash attributes to make the checkbox stuff work 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:43:57 +00:00
snipe 8f71460fa1 Formatting changes only 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:43:27 +00:00
snipe d5324bce6a Added more generic bulk translations for trans_choice 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:43:07 +00:00
snipe 660f3ccba1 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:28 +00:00
snipe bc8db3deab Added bulk delete routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:14 +00:00
snipe b2c8fbf349 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:04 +00:00
snipe c3f21d9292 Removed new checkbox selectability on users and assets - more complicated work to be done 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:41:58 +00:00