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

14092 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 801e58d52e Removed manual scoping 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:58:15 +01:00
snipe 06e9625c64 Use hasUser() to avoid table collisions and infinite loop 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:58:07 +01:00
snipe 5800e8d8e9 Added companyable trait 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:57:34 +01:00
snipe 623aa58163 Removed unused statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:57:25 +01:00
snipe 45cfec5b29
Merge pull request #14797 from bryanlopezinc/AddTestsForSettings 
Added test for setup page
 2024-05-31 02:31:35 +01:00
snipe ee8931f886
Merge pull request #14799 from marcusmoore/chore/remove-unused-component 
Removed unused Livewire component
 2024-05-31 00:54:43 +01:00
Marcus Moore 1a1b891309
Remove unused Login Livewire component 2024-05-30 16:49:05 -07:00
snipe 0981cfa902 Built assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 20:22:50 +01:00
snipe 37fbcfa22b
Merge pull request #14798 from Godmartinz/redirect_back_to_asset_fix 
Fixed checkin option from appearing
 2024-05-30 19:41:02 +01:00
Godfrey M 0ee441a976 adds hidden as well 2024-05-30 11:19:06 -07:00
Godfrey M cf8de3baa9 fix checkin option from appearing 2024-05-30 11:11:35 -07:00
bryanlopezinc 404ee238a3 Added test for setup page 2024-05-30 14:37:24 +01:00
snipe 5a5d171ba2 Put session facade back - derp 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 14:15:08 +01:00
snipe aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset 
Added Redirect options to asset check in/out
 2024-05-30 14:14:04 +01:00
snipe a46e2ebfd8 Small tweaks to user export, user view translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:59:00 +01:00
snipe f710b1aac3
Merge pull request #14614 from akemidx/feature/sc-19796 
ADDED: Export User Permissions (Superuser & Admin)
 2024-05-30 13:41:26 +01:00
snipe f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset 2024-05-30 13:38:11 +01:00
snipe bed8861179
Merge pull request #14796 from snipe/chore/sc-25715/axios 
Upgraded axios
 2024-05-30 13:17:23 +01:00
snipe 180d7b1b5b Upgraded axios 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:13:25 +01:00
snipe 386416ee5d
Merge pull request #14795 from snipe/bug/sc-25687/papaparse 
Upgraded papaparse
 2024-05-30 13:04:00 +01:00
snipe 6b5aa91f3d Upgraded papaparse 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:00:57 +01:00
Godfrey M e28ad50bec fixes the color change 2024-05-29 15:34:08 -07:00
Scarzy f48c5ee252 Fix an error message 2024-05-29 22:32:45 +01:00
Scarzy 98a94dec29 Change some errors to be 404 
The asset or file was not found, so 500 wasn't the best choice of error
code
 2024-05-29 22:17:36 +01:00
Scarzy ca9d4e3155 Get the tests for download and delete working 2024-05-29 22:01:49 +01:00
Scarzy 633bcbb6c4 Get the file upload test working 
Added the upload functionality to the get and delete tests, but I
currently don't seem to be able to reference the correct file ID
 2024-05-29 22:01:49 +01:00
Scarzy 2d4af61e6c Begin to add some tests 
There is currently only really a test for listing, and only for the
empty list response
 2024-05-29 22:01:49 +01:00
Scarzy 45329912e6 Give a better response to listing no files on an asset 
HTTP500 was never a good choice. Now it sends back an empty array
 2024-05-29 22:01:49 +01:00
Scarzy b9d56a8ecc Fix some routes 
Names of some of the routes overlapped with others in an incompatible
way. This makes the names more distinct
 2024-05-29 22:01:48 +01:00
Scarzy 91c1e53e52 Fix the test file location 2024-05-29 22:01:48 +01:00
Scarzy 73a87a8ea8 Add the framework of a test 2024-05-29 22:01:48 +01:00
Scarzy bb0a614c39 Update some comments 2024-05-29 22:01:48 +01:00
Scarzy f11ea79406 Add some sanity checks that the asset actually exists 2024-05-29 22:01:48 +01:00
Scarzy e817b20840 Fix some responses to be more appropriate 
Error/success was mixed up
 2024-05-29 22:01:48 +01:00
Scarzy 516f766a44 Remove some debug code 2024-05-29 22:01:48 +01:00
Scarzy f5791c79a5 Change the returns to be API appropriate 2024-05-29 22:01:48 +01:00
Scarzy f6a1a76095 Add an endpoint for deleting a file 2024-05-29 22:01:48 +01:00
Scarzy bbb9145744 Add an API endpoint to download files 2024-05-29 22:01:48 +01:00
Scarzy 194853d860 Remove a redundant line 2024-05-29 22:01:48 +01:00
Scarzy 92670d5711 Add the ability to list files for an asset 2024-05-29 22:01:48 +01:00
Scarzy 8a2ea971e1 Add an API assets files controller 
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
 2024-05-29 22:01:48 +01:00
Godfrey M 713ce7836f add some css in label field selector 2024-05-29 13:07:33 -07:00
snipe 12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout 
Bulk Consumable Checkout
 2024-05-29 19:42:25 +01: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