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

4007 commits

Author SHA1 Message Date
snipe
d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -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
Godfrey M
f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
Marcus Moore
a45ce468cc
Update return type for routing mail notifications 2023-02-01 11:44:56 -08:00
Marcus Moore
3580bdae86
Use object accessor instead of array accessor 2023-02-01 11:44:35 -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
Brady Wetherington
a4173e3881 Permit not-delegated+dont-expire-password+normal-accounts to login 2023-01-31 16:49:41 -08:00
Godfrey M
1e0c58c3cf saves data correctly now 2023-01-31 11:32:05 -08:00
lukasfehling
cddae4869f fixed the endpoint for user notification with all their assigned assets 2023-01-31 18:27:25 +01:00
Godfrey M
fc044528b8 validation is working, success message appears, database is not updating 2023-01-30 16:10:02 -08: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
Godfrey M
a63ea560ae adds submit button, getting setAttribute error 2023-01-26 15:17:08 -08:00
Marcus Moore
39289dd18e
Use user provided alert email for checkout acceptances 2023-01-26 13:18:18 -08:00
Marcus Moore
6fc8982478
Have acceptance result notifications adhere to alerts enabled setting 2023-01-26 12:59:33 -08:00
akemidx
df31a76906 fixed apostraphe 2023-01-26 15:02:39 -05:00
Brady Wetherington
4a54586690 Add to Accessories#index an additional gate-check against reports.view 2023-01-26 11:56:06 -08:00
Godfrey M
62b4c79150 adds a couple error messages 2023-01-25 16:38:08 -08:00
Godfrey M
a69cb6204a adds rest of inputs, and corrects Data binding 2023-01-25 16:22:34 -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
Godfrey M
2e22eeade5 adds one input 2023-01-25 14:29:20 -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
ab12ad1140 Resolves Rollbar error 16746 - missing array key 'extension' 2023-01-24 18:19:26 -08:00
snipe
9c79fc19cb Tightened up and removed some validation that wasn’t needed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:37:15 -08:00
snipe
fd2a057d38 Make audit dates fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:36:58 -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
snipe
3c4f254583 Enforce Y-m-d as date format for date fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 13:38:53 -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
Godfrey M
0f8ee22053 Creates Slack Setting Form 2023-01-24 09:25:05 -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
5f9af7d509 Updated API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:28 -08:00
snipe
febfcd4803 Updated model with new field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:19 -08:00
snipe
cad76f671a Added asset_eol_date to blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:42 -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