DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10054 commits 97 branches 266 tags 292 MiB
Commit graph

10054 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
snipe feef06e7bf Changed log level to debug vs info/error 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 06:54:41 -07:00
snipe 6800098469 Bumped version for 6.1.0-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 03:31:02 -07:00
snipe 468805bab5
Merge pull request #12732 from svpernova09/preflight-translation-string-fixes 
User preflight fix translation strings w/ bad path
 2023-03-27 10:43:13 -07:00
Joe Ferguson cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe 008ba83128
Merge pull request #12729 from snipe/fixes/file_importer_string 
Fixed translation string for importer
 2023-03-24 08:28:51 -07:00
snipe 697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -07:00
snipe 4d1e28ad03
Merge pull request #12727 from snipe/fixes/add_json_to_mimes 
Fixed #12641 - added JSON to mimes
 2023-03-24 07:22:30 -07:00
snipe 47eccb665e
Merge pull request #12728 from snipe/fixes/fixes_typo_in_category_list 
Use single “accessory” translation
 2023-03-24 07:19:59 -07:00
snipe 150a2b572e Use single “accessory” translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 07:14:02 -07:00
snipe 6bc0df73e8
Merge pull request #12661 from Godmartinz/gh12655_missing_translations 
Adds translations for category types to index and edit of categories
 2023-03-24 07:09:40 -07:00