DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 20:14:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
11928 commits 97 branches 267 tags 296 MiB
Commit graph

11928 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 2997de2a66
Merge pull request #12445 from snipe/fixes/exit_out_ldap 
Added an exit for the LDAP disabled sync short-circuit
 2023-02-01 16:48:00 -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 c706759b5c Merge remote-tracking branch 'origin/develop' 2023-02-01 16:42:11 -08:00
snipe 1432403c9f
Merge pull request #12444 from snipe/fixes/only_fire_ldap_sync_in_console_if_enabled 
Fixed: Short-circuit the LDAP sync is LDAP is disabled
 2023-02-01 16:40:32 -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 d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe ea4d5e69bc
Merge pull request #12407 from akemidx/slack_message 
Fixed: translation for slack message notification
 2023-02-01 13:44:12 -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
snipe 4a6250a08c
Merge pull request #12409 from akemidx/component_checkin_limit 
Fixed: Checkin limit string translation for components
 2023-02-01 13:37:56 -08:00
akemidx 0ffd40a217 fixing syntax 2023-02-01 16:30:07 -05:00
akemidx 33d819fd41 fixing pr 2023-02-01 16:13:53 -05:00
akemidx 90c1bfe03d fixing pr 2023-02-01 16:12:39 -05:00
akemidx 3702dd87ce fixing pr 2023-02-01 16:10:30 -05:00
akemidx 4d9d73483f fixing pr 2023-02-01 16:09:19 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
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
cram42 0f3c5d10ba Merge branch 'feature-label2' into develop 2023-02-01 18:01:46 +11:00
cram42 73fd0a24ca Clarify example asset variable 2023-02-01 17:58:58 +11:00
cram42 4b4c228f1a Correct parameter order 2023-02-01 17:56:23 +11:00
cram42 b72c6b7afc Fix 2D barcode defaults 2023-02-01 17:48:39 +11: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 6fbd20a11b Merge remote-tracking branch 'origin/develop' 2023-01-31 19:50:18 -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