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

2193 commits

Author SHA1 Message Date
snipe
8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe
eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
akemidx
690970b4aa fixing ff error 2023-02-22 18:18:20 -05:00
snipe
4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe
0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
snipe
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs 
Adds Livewire slack inputs
 2023-02-15 13:27:07 -08:00
snipe
3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes 
Style fixes
 2023-02-15 11:07:59 -08:00
Ivan Nieto Vivanco
6936efd387 Remove e() function from customfield format input 2023-02-12 16:27:37 -06:00
snipe
b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout 
Fix asset names being removed during API checkout requests
 2023-02-14 12:22:03 -08:00
Marcus Moore
8e00191b69
Add comment 2023-02-14 12:19:16 -08:00
Marcus Moore
a94f19a68e
Use name if provided by asset checkout request 2023-02-14 12:08:20 -08:00
Marcus Moore
2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
Marcus Moore
73f355f3a8
Return 422 instead of 500 when import is invalid 2023-02-08 12:39:42 -08:00
Marcus Moore
b3881a43a7
Fix return type 2023-02-08 12:34:25 -08:00
Marcus Moore
c2c666aef0
Formatting 2023-02-08 12:32:57 -08:00
Marcus Moore
5962f1b627
Catch json encoding exceptions and display them to the user 2023-02-08 12:21:51 -08:00
snipe
c1d484b5df Fixed mismatched field/fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 13:31:50 -08:00
snipe
d52d32fed9 Fixed visibility for constants and methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:44:02 -08:00
snipe
7363d4e223 FIxed yoda operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:35 -08:00
snipe
c8c5dddcc1 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:19 -08:00
Marcus Moore
38cdcdf064
Eager load company 2023-02-06 10:59:51 -08:00
snipe
51f3857a31 Fixed something I think I broke 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 15:32:45 -08:00
akemidx
b8951e2b54 fixing name from vipuser to vip 2023-02-02 15:58:05 -05:00
Godfrey M
17f1772143 removes postslack from settings controller 2023-02-01 16:58:08 -08:00
Godfrey M
3a86547ef5 fixes messages for integration test, removes slack request file, rehouses ajax method 2023-02-01 16:51:05 -08:00
snipe
d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe
1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name 
Fixed #12418 - added ability to edit custom field names via GUI
 2023-02-01 13:39:39 -08:00
Godfrey M
f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
snipe
f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe
2d45ebe103
Merge pull request #12433 from inietov/fixes/asset_declined_date_issues 
Fixed Invalid date value on assets acceptance mail notification
 2023-01-31 19:14:51 -08:00
lukasfehling
cddae4869f fixed the endpoint for user notification with all their assigned assets 2023-01-31 18:27:25 +01:00
Ivan Nieto Vivanco
ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
snipe
22b0b9b090 Fixed gates on fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:05:41 -08:00
snipe
583a0412fe Added edit fieldsets translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:23 -08:00
Brady Wetherington
4a54586690 Add to Accessories#index an additional gate-check against reports.view 2023-01-26 11:56:06 -08:00
akemidx
53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx
b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe
4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00
Brady Wetherington
b00333c9f5 Merge remote-tracking branch 'upstream/develop' into develop 2023-01-24 17:36:39 -08:00
Brady Wetherington
c9f0f5fe8b Change Accessories report to use server-side pagination from URL 2023-01-24 17:35:44 -08:00
akemidx
596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
Marcus Moore
b92d1d3ec7
Logically group query when searching users to scope to company 2023-01-24 11:54:56 -08:00
snipe
dc155846ca Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:49:17 -08:00
snipe
7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
snipe
02dcb0fbd7 Shorten the additiona form request invocation to just ImageUploadRequest 
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.

Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:37:35 -08:00
Jeremy Price
d3bcc48ae5 [imports] fix "Backup before importing?" checkbox on import page 
We were always taking backups before import, no matter the status of
this box.

Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.

We're now checking the status, and it behaves as expected
 2023-01-23 15:08:59 -08:00
snipe
41537a2449 Added field to the API controller endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:44 -08:00
snipe
cd8cb445ba Corrected fieldname for user fieldname for avatar in Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:53 -08:00
snipe
f77d871dff Use the imageHandler for profile avatar changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:20 -08:00
snipe
60eab08735 Added ->with(‘users as users_count’) in Accessory query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:41:07 -08:00