DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 11:34:08 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13774 commits 96 branches 267 tags 296 MiB
Commit graph

13774 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 14a0c9b5db Merge remote-tracking branch 'origin/develop' 2023-10-18 13:06:21 +01:00
snipe 3747165f25
Merge pull request #13759 from snipe/fixes/better_handle_deleted_variables_in_api_call 
Check for true/false explicitly on api table view
 2023-10-18 13:05:57 +01:00
snipe 787a64d313 Check for true/false explicitly on api table view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 13:05:06 +01:00
spencerrlongg f7bb911b99 clean up 2023-10-17 19:06:53 -05:00
spencerrlongg 388e4c10c4 catch custom fields that are arrays 2023-10-17 19:03:58 -05:00
Ivan Nieto Vivanco 74ed32903f Adds condition to check if parameter is of the proper type 2023-10-17 15:48:51 -06:00
snipe a6d3886aaf Merge remote-tracking branch 'origin/develop' 2023-10-17 22:37:50 +01:00
snipe f2bc7d6173
Merge pull request #13757 from snipe/fixes/RB-17334_user_formatted_array 
Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array
 2023-10-17 22:34:52 +01:00
snipe 72fe94edb3 Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-17 22:33:56 +01:00
snipe 3e54a9d561
Merge pull request #13756 from spencerrlongg/bug/label_logo_fix 
Fixed #13652 - Labels Using Wrong Logo
 2023-10-17 19:45:20 +01:00
spencerrlongg 4bdd070f7b formatting 2023-10-17 13:41:31 -05:00
spencerrlongg 277608d962 this seems to work 2023-10-17 13:30:51 -05:00
Brady Wetherington 3d5847f4b3 Merge branch 'develop' into snipeit_v7_laravel10 2023-10-16 23:37:13 +01:00
snipe 82c2a46ada Commented out noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 23:24:03 +01:00
snipe 3f6554ee34 Use singleton for offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 23:23:43 +01:00
snipe 73ec84903e Merge remote-tracking branch 'origin/develop' 2023-10-16 23:15:05 +01:00
snipe 1e0512ad44
Merge pull request #13753 from snipe/fixes/check_for_valid_location 
Check that the location is valid before debugging
 2023-10-16 23:14:41 +01:00
snipe 23fa92f4ce Check that the location is valid before debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 23:13:38 +01:00
snipe 55d0c4021d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-10-16 20:19:03 +01:00
snipe 2218cff7bc Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:18:33 +01:00
Brady Wetherington db400dffb5 Merge branch 'develop' into snipeit_v7_laravel10 
Rebuild assets and re-install from npm
 2023-10-16 20:13:59 +01:00
snipe 199cdf6899 Commented out noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:05:11 +01:00
snipe 752171d5b8 Use singleton for offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:05:11 +01:00
snipe 8c4bf74f93 Commented out noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-14 20:43:18 +01:00
snipe 4e3d5707ce Use singleton for offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-14 20:39:52 +01:00
snipe 37858d870a Merge remote-tracking branch 'origin/develop' 2023-10-13 19:58:37 +01:00
snipe b1f158ba5a
Merge pull request #13749 from snipe/bug/sc-23473 
Handle case where value is deleted in history
 2023-10-13 19:58:19 +01:00
snipe a92a9d7616 Removed duplicated deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:53:11 +01:00
snipe 8f23a45cb3 Removed dummy text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:49:03 +01:00
snipe 93cccf4f5f Handle case where value is deleted in history 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:32:09 +01:00
snipe dcdc294135 Merge remote-tracking branch 'origin/develop' 2023-10-13 12:40:30 +01:00
snipe 04f6f39588
Merge pull request #13748 from snipe/bug/sc-23830 
Fixed #13723 - race condition on asset observer for older migration
 2023-10-13 12:40:14 +01:00
snipe ca1420c9bd Added the temp column back in 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:39:28 +01:00
snipe 2537d0fdaf Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:34:46 +01:00
snipe b2aed7feea Removed temp column 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:30:26 +01:00
snipe ea960c39bb Check if the eol_explicit column exists yet, add it if not 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:19:32 +01:00
snipe 0b39591d88 Add the eol_explicit column earlier to accomodate the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:18:58 +01:00
snipe c14a01eb8b Added comments to explain the potential race condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:18:19 +01:00
snipe 2a9ed09f77 Merge remote-tracking branch 'origin/develop' 2023-10-13 10:03:18 +01:00
snipe b96e77268a
Merge pull request #13745 from spencerrlongg/bug/table_prefix_migration_fix 
Resolves issue with migrations with table prefixes
 2023-10-13 08:49:28 +01:00
spencerrlongg f3bd23da3d rm whitespace 2023-10-12 14:53:17 -05:00
spencerrlongg 9b53b0fedc resolve issue with migrations with table prefixes 2023-10-12 14:50:12 -05:00
snipe 0d2f43c04f Merge remote-tracking branch 'origin/develop' 2023-10-11 12:00:54 +01:00
snipe 138ec33555
Merge pull request #13733 from marcusmoore/bug/sc-23453 
Fixed notification logic to ensure check in and out emails are delivered
 2023-10-11 12:00:37 +01:00
snipe e99d307350
Merge pull request #13734 from marcusmoore/bug/sc-23661 
Fixed the storing of group permissions when creating via API
 2023-10-11 03:46:49 +01:00
Marcus Moore 417f9c21e4 Fix the storing of group permissions when creating via API 2023-10-10 17:51:29 -07:00
Marcus Moore 43b9e6401c Formatting 2023-10-10 15:18:55 -07:00
Marcus Moore dae9e6d096 Improve try catch blocks 2023-10-10 15:18:37 -07:00
Marcus Moore 9ef598d07b Apply changes to exception handling for check outs to check ins 2023-10-10 15:16:12 -07:00
Marcus Moore 2a29566458 Catch all ClientExceptions on check out 2023-10-10 15:15:02 -07:00