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

3794 commits

Author SHA1 Message Date
snipe
8c3511a00b Fixed wonky switch statement indenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
c1ae406049 Fixed visibility for constants and methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
1ef3112628 FIxed yoda operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
0325cbad64 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
6dc89fc2b0 Use null coalescing operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
b25676c96b Fixed Implicit array creation is disallowed. 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
14e95c47e1 Made constant DATA_SESSION_KEY public 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe
dc43c4f68a Removed unneeded concat 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
Ivan Nieto Vivanco
53e449899b Remove e() function from customfield format input 2023-02-15 11:33:08 -08:00
Marcus Moore
7423570e6b Add comment 2023-02-15 11:33:08 -08:00
Marcus Moore
b946a6066d Use name if provided by asset checkout request 2023-02-15 11:33:07 -08:00
Marcus Moore
e69fcf10b7 Use translation strings for importer exceptions 2023-02-15 11:33:07 -08:00
Marcus Moore
fdce6f98ff Return 422 instead of 500 when import is invalid 2023-02-15 11:33:07 -08:00
Marcus Moore
5a00685c81 Fix return type 2023-02-15 11:33:07 -08:00
Marcus Moore
18f0b1cc3d Formatting 2023-02-15 11:33:07 -08:00
Marcus Moore
6da43bc940 Catch json encoding exceptions and display them to the user 2023-02-15 11:33:07 -08:00
Ivan Nieto Vivanco
98187773f7 Adds translation strings to theinventory report sent to users 2023-02-15 11:33:07 -08:00
snipe
c1d484b5df Fixed mismatched field/fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 13:31:50 -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
snipe
0cfeab8c50 Added an exit for the LDAP disabled sync short-circuit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:46:58 -08:00
snipe
67e6089805 Short circuit the LDAP sync is LDAP is disabled 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:36:30 -08:00
snipe
2da4578aa5
Merge branch 'develop' into slack_message 2023-02-01 13:43:09 -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
snipe
0d4ca218c5
Merge pull request #12437 from uberbrady/ldap_allow_undelegatable_users_to_login 
Fixed: Active Directory "not-delegated+dont-expire-password+normal-accounts" can now login
 2023-02-01 13:38:59 -08:00
akemidx
90c1bfe03d fixing pr 2023-02-01 16:12:39 -05:00
akemidx
4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05: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
Brady Wetherington
a4173e3881 Permit not-delegated+dont-expire-password+normal-accounts to login 2023-01-31 16:49:41 -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
cfe9c687f9 Mark a bunch of SCIM config as nullable 2023-01-25 15:54:57 -08:00
Brady Wetherington
91cf683f3d Re-do the entire SCIM config so it no longer inherits 2023-01-25 15:53:46 -08:00
Brady Wetherington
ab12ad1140 Resolves Rollbar error 16746 - missing array key 'extension' 2023-01-24 18:19:26 -08:00
akemidx
596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05: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
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
48c85966d7 Added gravatar and avatar as fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:07:17 -08:00
snipe
a0aed19f95 Refactor image handler 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:05:55 -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
snipe
90c1631820 Added users_count to transformer for API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:35 -08:00
snipe
dceb77d4d4 Refactored numRemaining, removed unnecessary numCheckout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:20 -08:00
snipe
46e3e8a3dd Added new users_count field to API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:39:53 -08:00
Marcus Moore
181f96ad33
Allow users to set a blank asset name during checkout 2023-01-19 12:35:44 -08:00