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

11352 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore ebfc395e78
Improve messaging 2023-08-01 14:39:30 -07:00
Marcus Moore 5c8c2ca027
Improve variable names 2023-08-01 14:26:21 -07:00
snipe 924f5287f7
Merge pull request #13392 from Godmartinz/change_webhook_variable_type 
Fixed `webhook_endpoint` data type from varchar to a text
 2023-08-01 20:28:39 +01:00
Godfrey M 7560afb8c4 changes webhook_endpoint var to a text 2023-08-01 10:45:39 -07:00
Godfrey M 8a24a47475 removed unnecessary code 2023-08-01 09:45:48 -07:00
Godfrey M fb52038e7c applies a check if a sync field is designated 2023-08-01 09:39:58 -07:00
Brady Wetherington daed0b60bc Merge branch 'develop' into snipeit_v7_laravel10 2023-07-31 19:40:56 +01:00
snipe ffb605a37c
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today 
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
 2023-07-31 15:04:22 +01:00
Brady Wetherington 4654f7aa37 Porting Snipe-IT v7 to Laravel v10 2023-07-31 14:07:12 +01:00
snipe 343aacab85
Merge pull request #13386 from snipe/security/dep_updates 
Updated BS table and table export plugins
 2023-07-31 13:46:41 +01:00
snipe 96d69b654d Updated BS table and table export plugins 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-31 13:45:15 +01:00
snipe 2e1c3fb51b
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields 
Fixed #11794 Admins Cannot View Encrypted Field
 2023-07-31 13:08:28 +01:00
snipe 3e4b371bf4
Merge pull request #13379 from inietov/fixes/component_checkout_via_api_returns_error 
Fixed #13376 Component checkout via API returns error
 2023-07-31 13:07:38 +01:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Ivan Nieto Vivanco 0a841ddbb8 Change component validator to the correct asset id we're passing in the API call 2023-07-27 20:22:13 -06:00
Brady Wetherington 70e87dad1c Merge branch 'develop' into snipeit_v7 2023-07-27 16:21:31 +01:00
snipe af86c6138d
Merge pull request #13361 from Godmartinz/bug/sc-19126 
Fixed custom fieldset order
 2023-07-26 08:55:18 +01:00
snipe f6545be410
Merge pull request #13363 from inietov/fixes/no_records_found_multipage_license_seats 
Fixed #13298 "No records Found" when Switching between Single and Multi-Page Licenses
 2023-07-26 08:48:44 +01:00
Ivan Nieto Vivanco c015264181 Adjust the license offset if it exceeds the total of license seats 2023-07-25 16:23:33 -06:00
Godfrey M 9c6e8d57aa removes typos 2023-07-25 11:44:16 -07:00
Godfrey M 11e3487263 custom field set order starts at 1 now 2023-07-25 11:41:08 -07:00
snipe a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page 
Delete button on asset view page
 2023-07-25 12:11:35 +01:00
akemidx e289e95721 no ? needed 2023-07-24 17:22:10 -04:00
akemidx b082d27c42 removing :item 2023-07-24 17:12:12 -04:00
snipe 39ea15a27a
Merge pull request #13347 from snipe/fixes/custom_report_error_on_bad_model 
Possible alternative to fixing #13296 - custom report failing when th…
 2023-07-21 15:18:16 +01:00
snipe 4fe6632167
Merge pull request #13349 from snipe/fixes/check_for_valid_model 
Fixed: tighter check for valid model
 2023-07-21 14:52:00 +01:00
snipe 1a771e6ab9 Check that the model is valid before trying to chain the relationship 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:58 +01:00
snipe 7f761000b4 Use slightly less terrifying and more accurate language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:39 +01:00
Ivan Nieto Vivanco cb4ed92639 Use Carbon date objects instead of casting using DB::raw() 2023-07-20 16:17:06 -06:00
snipe 540b09c506 Possible alternative to fixing #13296 - custom report failing when the model is busted 
Related: https://github.com/snipe/snipe-it/pull/13297
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 17:45:45 +01:00
Brady Wetherington ba8d8a6f05 Merge branch 'develop' into snipeit_v7 2023-07-20 17:16:04 +01:00
snipe 0b8a3ee9a5
Merge pull request #13346 from snipe/fixes/depreciable 
Check that $this->get_depreciation() returns
 2023-07-20 16:33:15 +01:00
snipe 1e09320ebe Check that $this->get_depreciation() returns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 16:30:07 +01:00
snipe ee36497acf
Merge pull request #13344 from snipe/fixes/added_manufacturer_to_licenses 
Fixes bug/sc-23509: Added manufacturer back into license importer
 2023-07-20 14:05:19 +01:00
snipe d7ac8ef618 Added manufacturer to licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 14:02:54 +01:00
snipe 244e4ec11f Added manufacturer back into license importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 13:48:51 +01:00
snipe 917005ceb4
Merge pull request #13342 from Loemnk/develop 
Fixes #13341: Clean up correct seats on license delete
 2023-07-20 13:05:31 +01:00
Tobias Franzius 90a344af0b Fixes #13341 Clean up correct seats on license delete 
Before this, we checked for the `id` collumn in the `license_seats` table, insteasd of
using `license_id` for this.

This way, we ensure that we only alter seats belonging to the correct license.
 2023-07-20 13:48:57 +02:00
Ivan Nieto Vivanco ecf522243b Add the new rule to proper views and also in the Asset Transformer 2023-07-19 19:52:03 -06:00
Ivan Nieto Vivanco 705411eb4d Create the Gate that goes with the permission 2023-07-19 19:44:59 -06:00
Ivan Nieto Vivanco 3b4a2b0f5b Add permission to view and modify encrypted custom fields 2023-07-19 14:57:57 -06:00
snipe a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets 
Current value added to asset index page
 2023-07-19 19:06:15 +01:00
akemidx 9e2987e680 changing book value to be NOT searchable or sortable 2023-07-19 13:44:31 -04:00
snipe 1e1aea2eb0
Merge pull request #13299 from ubc-cpsc/bugfix/CVE-2023-37260 
Update league/oauth2-server for CVE-2023-3726
 2023-07-19 13:14:35 +01:00
Brady Wetherington 605d267fe8 Merge branch 'develop' into snipeit_v7 2023-07-19 11:47:51 +01:00
snipe 33fd904c18
Merge pull request #13330 from akemidx/merge_users_typo 
merge users page typo fix
 2023-07-19 10:26:57 +01:00
snipe dc20305db6
Merge pull request #13333 from snipe/fixes/strtolower_on_catgories 
Added strtolower for category type
 2023-07-19 09:00:55 +01:00
snipe a0a5ca1f40 Added strtolower for category type 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 08:56:17 +01:00
akemidx 064e696521 merge users page typo fix 2023-07-18 15:33:33 -04:00
snipe c1949ffb0d
Merge pull request #13319 from marcusmoore/chore/user-search-test-cases 
Added test cases around user search
 2023-07-18 13:27:22 +01:00