lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
10351 commits 1 branch 0 tags 220 MiB
Commit graph

3387 commits

Author SHA1 Message Date
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
b84eaaf61a translations done 2023-03-30 13:48:05 -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
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
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
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
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
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
09674c012c Use named route with params 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 07:18:45 -07:00
Joe Ferguson
cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe
697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -07:00
snipe
16dcc2d3ed Fixed #12641 - add JSON to mimes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 06:57:43 -07:00
snipe
13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null 
Fixed Trying to access array offset on value of type null [sc-20528]
 2023-03-24 04:52:56 -07:00
Marcus Moore
9d2c4a4dee
Update webhook message 2023-03-23 10:38:35 -07:00
Marcus Moore
fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco
aa8dfcf89f Added a ternary to avoid null offset in array 2023-03-22 13:48:23 -06:00
snipe
e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178 
#20178: Added Dell and Lenovo to warranty link function
 2023-03-22 00:54:40 -07:00
snipe
545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe
473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
snipe
e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -07:00
Brady Wetherington
6fe520a55d Hooked various the contents of the components together 2023-03-21 22:26:32 -07:00
snipe
0418d390f0 Corrected width to 100% 
I should not be allowed to touch computers

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:25:15 -07:00
snipe
b3d5bb75a3 Apply master patch to develop because I am an idiot on the wrong branch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:23:09 -07:00
snipe
1fa9f80c03 Correctly disable the select2 in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:18:42 -07:00
snipe
e40762cf7f Small anal-retentive spacing/indenting tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:00:43 -07:00
snipe
2d3ddd1c7a Fixed default value for webhook_selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:56:08 -07:00
snipe
637438ccf6 Added select2 to slack settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:00:11 -07:00
snipe
647f47cdfe Check for demo mode in the clear method for the controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:27:05 -07:00
snipe
a14d1b981d Switched singleton to static helper method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:22:18 -07:00
snipe
f29e813332 Translated “Clear & Save” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:35 -07:00
snipe
d883084830 Fixed some funky HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:26 -07:00
snipe
658252125e Added new partial for the form inline “demo mode” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:57:27 -07:00
snipe
35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up 
adds clear and save button, save button updates accordingly
 2023-03-21 17:02:33 -07:00
Godfrey M
2754277068 adds csrf token and missing divs 2023-03-21 16:12:46 -07:00
snipe
c229d69cec Added next audit date override in bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 16:01:41 -07:00
Godfrey M
3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00