DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
13742 commits 96 branches 267 tags 295 MiB
Commit graph

13742 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe be4e809254
Merge pull request #14762 from marcusmoore/chore/update-v7-test 
Fixed test by removing non-existent trait
 2024-05-25 11:18:54 +01:00
snipe dc5e15f919 Added translation for external link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 11:02:07 +01:00
snipe ad7b291062 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:55:48 +01:00
snipe b54c1caa74 Improved translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:43:28 +01:00
snipe c3cf123189 Better translation for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:39:47 +01:00
snipe 3a2900621c Changed icon, added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:20:52 +01:00
Marcus Moore 639cbf6d53
Remove passport:install command 2024-05-23 15:56:58 -07:00
Marcus Moore e03b5754a8
Combine steps 2024-05-23 15:54:32 -07:00
Marcus Moore 4ce86a061f
Set DB_CONNECTION 2024-05-23 15:43:59 -07:00
Marcus Moore fa6e170feb
Install passport 2024-05-23 14:01:06 -07:00
Marcus Moore 51f72daba1
Debugging step 2024-05-23 13:55:03 -07:00
Marcus Moore a130033480
Revert "Add Install Passport step" 
This reverts commit ef95ede833.
 2024-05-23 12:45:38 -07:00
Marcus Moore ef95ede833
Add Install Passport step 2024-05-23 12:32:34 -07:00
Marcus Moore d06e5f25b0
Remove old trait from test 2024-05-23 11:51:08 -07:00
snipe 8b3ff5a82d Handle potentially deleted admin users in license export 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-23 08:39:15 +01:00
Marcus Moore 482ebfbb68
Implement test 2024-05-22 17:21:29 -07:00
Marcus Moore 67c4fa2966
Improve event assertions 2024-05-22 17:14:10 -07:00
Marcus Moore a3389a31cd
Update test name and add todo 2024-05-22 17:10:16 -07:00
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00