DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-12 16:44:08 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
13682 commits 97 branches 266 tags 292 MiB
Commit graph

13682 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 7d1acd3d79
Update Livewire via composer 2024-05-29 12:04:06 -07:00
snipe fba72e1e8d
Merge pull request #14789 from snipe/fixes/14781_broken_wrench_icon 
Fixed #14781 - Fixed broken wrench icon on some browsers in manufacturer section
 2024-05-29 19:23:21 +01:00
snipe 7bbee053c6 Updated fa icon call 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 19:19:45 +01:00
snipe 6ea1a3bacf
Merge pull request #14788 from snipe/security/Snyk-Upgrade-jquery-ui-from-1.13.2-to-1.13.3-#14735 
Updated jquery-UI
 2024-05-29 18:47:39 +01:00
snipe 603afe4466 Updated jquery-UI 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:44:39 +01:00
snipe 037ee8c07a
Merge pull request #14787 from snipe/fixes/return_redirect_fixes_for_docblock 
Fixes path for redirect response
 2024-05-29 18:28:00 +01:00
snipe df1cef59d5 Fixes path for redirect response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:01:40 +01:00
snipe 3fcd196c04
Merge pull request #14786 from snipe/security/upgrade_bs_tables 
#14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5
 2024-05-29 13:12:07 +01:00
snipe 8ee5e7cd0a #14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 13:10:46 +01:00
snipe 1ec85063ee
Merge pull request #14785 from snipe/fixes/updates_facade_paths 
Fixed/updated facade paths
 2024-05-29 13:03:13 +01:00
snipe 92ba889cae Updated/removed facades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:53:51 +01:00
snipe f17162c2e2 Use artisan facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:40:05 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
snipe 369c819a27
Merge pull request #14754 from Godmartinz/footer_user_bug 
Removed extra div from User Details.
 2024-05-29 11:29:02 +01:00
snipe f1eb4bd3a5
Merge pull request #14349 from snipe/jerm/update-mailer-configs 
Update mailer configurations for Symfony mailer
 2024-05-29 11:25:55 +01:00
snipe 2f828683da
Merge pull request #14783 from snipe/fixes/fixed_category_test_depreciation_warning 
Fixed deprecation warning on category test
 2024-05-29 11:19:31 +01:00
snipe 13db151297 Fixed deprecation warning on category test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 11:06:51 +01:00
snipe bb95c231e5 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-05-29 10:55:12 +01:00
snipe dcea14fb99
Merge pull request #14778 from uberbrady/fix_8_3_compat 
Allows Snipe-ITv7 to install on PHPv8.1-8.3
 2024-05-29 10:55:02 +01:00
snipe 282fed27da Add @bryanlopezinc as a contributor 2024-05-29 10:46:59 +01:00
snipe cf3ffe9c74
Merge pull request #14782 from bryanlopezinc/ReduceIDeErrors 
Reduce IDE errors in App\Http\Controllers\SettingsController
 2024-05-29 10:46:03 +01:00
bryanlopezinc 5d01a06245 Reduce IDE errors in App\Http\Controllers\SettingsController 2024-05-29 08:07:49 +01:00
snipe 02cdda56e2 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-05-29 02:00:25 +01:00
snipe ffecd97665 Bumped laravel in readme 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 02:00:21 +01:00
snipe 779cf9418e
Merge pull request #14780 from marcusmoore/fixes/sqlite-tests-in-gh 
Fixed sqlite tests in GitHub Actions
 2024-05-29 01:59:12 +01:00
Marcus Moore 34b4452645
Skip "migrating" and run passport:keys for sqlite testing in GH 2024-05-28 17:41:01 -07:00
snipe da1c4c23e6 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-05-29 00:26:37 +01:00
snipe a5d0a21757 Fixed string path 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 00:26:33 +01:00
snipe 29454f7288
Merge pull request #14779 from marcusmoore/fixes/fix-group-create-endpoint 
Fixed Array to string conversion exception in group create api endpoint
 2024-05-28 23:26:34 +01:00
Brady Wetherington e271711c5b Added the clock-lts repo which allows use on php8.1-8.3 2024-05-28 22:50:09 +01:00
Marcus Moore 4c78da3bbf
Re-add json encoding of permissions 2024-05-28 13:03:09 -07:00
Marcus Moore 71bab2c315
Improve test case 2024-05-28 13:02:44 -07:00
snipe 7d2af61989
Merge pull request #14775 from snipe/bug/sc-25676/groups_api 
Fixed #14771: improvements to groups API
 2024-05-28 15:33:36 +01:00
snipe 03b5c2e246 Fixed bad translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:21:28 +01:00
snipe 33d5d5e24f Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:21:13 +01:00
snipe 3df2a4a70b Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:16:44 +01:00
snipe 6b41970e97 Check that selected is an array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:15:31 +01:00
snipe 92eb6eb1b6 Add unique constraint to name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:09:31 +01:00
snipe 206238e83f
Merge pull request #14773 from snipe/bug/sc-25674/location_currency_on_edit 
Pass accessory's currency if set by location
 2024-05-28 10:29:20 +01:00
snipe df882bbcbc Pass item’s currency if set by location 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 10:24:10 +01:00
snipe 6c1c3a99dd Bumped current_snipeit_version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-27 19:22:24 +01:00
snipe 54067ec449 Fixed pre-version in version.php 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-27 18:21:46 +01:00
snipe 4c11e97922 Bumped version to dev, bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-27 18:20:32 +01:00
Brady Wetherington 8df9007a8e Merge branch 'snipeit_v7_laravel10' into develop 2024-05-27 18:08:27 +01:00
snipe 172d24fd3c
Merge pull request #14770 from uberbrady/add_locations_parent_index 
Add index to 'parent_id' for users with large number of locations
 2024-05-27 15:43:49 +01:00
Brady Wetherington 28b450fd3c Add index to 'parent_id' for users with large number of locations 2024-05-27 15:38:42 +01:00
snipe 485caf1d92
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout 
Added tests around asset checkout
 2024-05-25 11:33:33 +01:00
snipe 29cd75a6d2
Merge pull request #14766 from snipe/chore/sc-25656/minus_icon_for_fieldsets 
Changed icon, added translation
 2024-05-25 11:19:56 +01:00
snipe b3fe10baa8
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets 2024-05-25 11:19:43 +01:00
snipe 093cc9faf0
Merge pull request #14767 from snipe/chore/sc-25657/improved-translations 
Improved translations
 2024-05-25 11:19:14 +01:00