DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9550 commits 102 branches 268 tags 288 MiB
Commit graph

9550 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx a8643e5d35 cleaning up/adding variable 2023-02-01 15:55:16 -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 38f3843c23
Merge pull request #12386 from snipe/features/fixed_12382_added_checked_out_count_to_accessories 
Fixed #12382 - added checked out count to accessories
 2023-01-31 19:57:12 -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 de1141491a Replaced help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-31 19:41:42 -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
snipe 656344b1c7
Merge pull request #12429 from svpernova09/benperiton/patch-1 
Cherry-picked Feature: Add DB_PORT to pgsql connection
 2023-01-31 19:10:17 -08:00
snipe 7a23398c0c
Merge pull request #12439 from uberbrady/fix_bootstrap_username_doubling 
Fixed: username doubles on 'checked-out-to' column if display is resized [sc-19869], [fd-33242]
 2023-01-31 18:10:02 -08:00
Brady Wetherington 02ca5248b1 Don't append username to the user's name if it's already there 2023-01-31 17:44:09 -08:00
snipe b1179c7b1e
Merge pull request #12438 from inietov/fixes/replace_ios_homescreen_logo 
Fixed #9694 Replace iOS "Add to homescreen icon"
 2023-01-31 17:02:05 -08:00
Brady Wetherington a4173e3881 Permit not-delegated+dont-expire-password+normal-accounts to login 2023-01-31 16:49:41 -08:00
snipe a2a078015f
Merge pull request #12435 from lukasfehling/bugfix/fixed-endpoint-for-user-notification 
Fixed the endpoint for user notification with all their assigned assets
 2023-01-31 12:41:47 -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
Ivan Nieto Vivanco a7a578bf51 Added head only logo to be used as default in apple-touch-icon 2023-01-31 00:13:44 -06:00
Godfrey M fc044528b8 validation is working, success message appears, database is not updating 2023-01-30 16:10:02 -08:00
akemidx 214a1af61a apostrophe updates 2023-01-30 16:54:23 -05:00
Ivan Nieto Vivanco ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
Ben Periton c2854f1bcb
Update database.php 
Although Postgres is not officially supported, it does seem to work ok, but to help a little bit with the Docker image, this is non-breaking change but allows the env file to specify the pgsql connection port
 2023-01-29 19:28:04 -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
snipe a16604285c Normalize the fieldset form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:07 -08:00
snipe 37f5cfa8ce Added edit button for fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:02:53 -08:00
Godfrey M a63ea560ae adds submit button, getting setAttribute error 2023-01-26 15:17:08 -08:00
akemidx 79d9cff22a translations added for the hardware blades 2023-01-26 16:26:31 -05: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
snipe cc370084d1
Merge pull request #12341 from uberbrady/redo_scim_config 
Redo SCIM config; use latest laravel-scim-server from our fork
 2023-01-26 12:57:29 -08:00
Brady Wetherington cd573c484d Change the SCIM_STANDARDS_COMPLIANCE config to default to 'true' 2023-01-26 12:48:41 -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 c5d3b3ab81 Change out the SCIM config for a fixed one; update our fork of the SCIM-server 2023-01-25 15:59:46 -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
snipe 6b729502c6 Rebuilt dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 19:13:40 -08:00
snipe f0b14513db
Merge pull request #12411 from uberbrady/fix_rb_16746 
Resolved Rollbar error 16746 - missing array key 'extension'
 2023-01-24 18:24:18 -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 a61ccbb965 Added very clunky but better error messages on that validation for date_format 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:33:49 -08:00