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
10429 commits 95 branches 267 tags 295 MiB
Commit graph

10429 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 621d8500eb
Merge branch 'develop' into bug/sc-15034 2023-03-30 16:17:42 -07:00
Marcus Moore 134ab631d4
Add test to ensure notification is not sent for license checkouts if not enabled 2023-03-30 15:38:22 -07:00
Marcus Moore 158e1544cd
Test the event instead of the checkout 2023-03-30 15:38:00 -07:00
snipe 986c73982e Check if status is set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:50:56 -07:00
snipe ed8535a197
Merge pull request #12767 from snipe/fixes/bulk_restore 
Quick fix for bulk restore menu
 2023-03-30 14:48:43 -07:00
snipe 1fc0a0f94d Quick fix for bulk restore menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:44:38 -07:00
snipe cfef9d8cca
Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null 
Fixed Call to a Member Function Licenses() on null [sc-20606]
 2023-03-30 14:20:13 -07:00
snipe dfa9c07217
Merge pull request #12760 from akemidx/apple_warranty_link_fix2 
Updating Apple warranty link to match current Apple webpage
 2023-03-30 12:47:09 -07:00
akemidx 0c38257f80 fixing one liner 2023-03-30 15:40:23 -04:00
snipe 9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304 
Bulk Restore from Deleted
 2023-03-30 12:37:50 -07:00
slong753 0f72554a9f translations for messages 2023-03-30 13:57:18 -05:00
slong753 382d849ee1 added catch for no assets selected 2023-03-30 13:52:29 -05:00
slong753 b84eaaf61a translations done 2023-03-30 13:48:05 -05:00
slong753 8c1c0e81b6 rm deplicates 2023-03-30 13:31:58 -05:00
snipe b7c09042b0
Merge pull request #12758 from inietov/fixes/call_to_member_function_present_null 
Fixed Call to a member function present() on null [sc-20594]
 2023-03-30 11:01:38 -07:00
snipe 10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix 
Fixes potential unwanted overwrites in asset imports
 2023-03-30 09:40:58 -07:00
slong753 e126a75f7a pretty sure this was it 2023-03-29 21:37:26 -05:00
Ivan Nieto Vivanco d10b7fd6af Use firstorfail on eloquent query to return error if asset is not found 2023-03-29 19:11:28 -06:00
slong753 d5d50264c3 fix permissions stuff + optional parameter 2023-03-29 19:53:04 -05:00
Ivan Nieto Vivanco d622dbb943 Revert the php codeblock and replace it with a ternary 2023-03-29 18:37:47 -06:00
Marcus Moore 6beb3b551a
Fix typo 2023-03-29 17:01:24 -07:00
Marcus Moore 0998c70a92
Remove unneeded import 2023-03-29 16:59:26 -07:00
Marcus Moore 9f8b8f6cc1
Remove unneeded variable 2023-03-29 16:58:55 -07:00
slong753 d033733fc0 oops, remove a couple things 2023-03-29 18:30:39 -05:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
slong753 162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
Marcus Moore 863a346d6e
Translate strings 2023-03-29 13:37:14 -07:00
Marcus Moore e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
akemidx 6bee4c1a75 Updating Apple warranty link to match current Apple webpage 2023-03-29 15:09:14 -04:00
Marcus Moore 4cbe683a1a
Explicitly cast asset tag to string when querying 2023-03-29 11:28:04 -07:00
Marcus Moore 9cc74caa9e
Add wire:model to import form checkboxes 2023-03-29 10:58:25 -07:00
Ivan Nieto Vivanco d7c531e1c7 Checks if user variable exist before using its properties 2023-03-29 10:33:15 -06:00
Dominik Both 3271c9dc9f Fix #8208, #8896, #8985, #9789 2023-03-29 09:56:34 +02:00
snipe c9d1274edc
Merge pull request #12753 from snipe/fixes/lang_for_group_not_found 
Fixes/lang for group not found
 2023-03-28 16:45:22 -07:00
snipe 32922e6461 Use corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:52 -07:00
snipe 527c812d04 Use icon for group users header 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:41 -07:00
snipe b57b5e23d9
Merge pull request #12752 from inietov/fixes/attempt_to_read_property_on_null 
Fixed ErrorException: Attempt to read property "rtd_location_id" on null [sc-20562]
 2023-03-28 16:32:34 -07:00
snipe 94de9edce7
Merge pull request #12751 from snipe/features/added_snipeagent_link 
Added link to SnipeAgent
 2023-03-28 16:27:03 -07:00
snipe 88826c1115 Added link to SnipeAgent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:26:27 -07:00
Ivan Nieto Vivanco 77d513f80b Assign target variable as the other checkout types 2023-03-28 17:25:57 -06:00
Ivan Nieto Vivanco d70b7dbf41 Checks if exist on API checkout 2023-03-28 16:12:48 -06:00
snipe 2306f30158 Updated author link to @Karpadiem 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 14:26:59 -07:00
snipe 667a5a9274
Merge pull request #12750 from snipe/features/added_kandji_and_unifi_links 
Added links to kandji2snipe and UnifiSnipeSync
 2023-03-28 13:42:40 -07:00
snipe a0eb9dc735 Added links to kandji2snipe and UnifiSnipeSync 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 13:41:58 -07:00
snipe e03a961bcc
Merge pull request #12747 from svpernova09/preflight-strings 
Pre-Flight String fixes for step 2
 2023-03-28 08:37:43 -07:00
Joe Ferguson 47e18db172
Fix next button string for Step 2 preflight 2023-03-28 10:30:56 -05:00
Joe Ferguson d667ae53ed
Add missing strings to Step 2 preflight 2023-03-28 10:30:35 -05:00
snipe 099173fb94
Merge pull request #12744 from snipe/fixes/12742_wrong_url_on_requestable_models 
Use named route with params
 2023-03-28 07:19:49 -07:00
snipe 09674c012c Use named route with params 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 07:18:45 -07:00
snipe 52fd334745
Merge pull request #12743 from snipe/fixes/quieter_logging 
Changed log level to debug vs info/error
 2023-03-28 06:56:06 -07:00