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

2170 commits

Author SHA1 Message Date
akemi 2f8a435e18 fixing curly quotes 2022-12-05 18:06:28 -05:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
snipe 1fe0bfe17e Removed extra logging case that was very noisy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:27:42 -08:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M a02a04d601 fixes a regression with the csv assigned to fields 2022-11-16 16:34:57 -08:00
snipe 489895a5fa Added comments and spacing for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:48:28 +00:00
snipe 1122562b4e Handle use case where there are no custom fields for any assigned models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:45:50 +00:00
snipe 5df76155ce Check for the format index in the $data array when creating a new custom field via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 15:53:16 +00:00
Godfrey M 45636b8114 adds should_autoassign boolean to users table 2022-11-15 15:42:57 -08:00
snipe 6400bdc266
Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag 
Added ability to include deleted items in tag search endpoint
 2022-11-15 17:54:34 +00:00
snipe ffd252a00c
Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification 
Added: API endpoint to trigger a user email notification with their assigned assets
 2022-11-15 17:51:15 +00:00
snipe 7fcf6f2463 Removed deleted parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:47:21 +00:00
snipe 2c5a0d370c Clean up API byserial and bytag, allow deleted param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:33:56 +00:00
snipe bcbe517446 Added ability to include deleted items in tag search endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:18:09 +00:00
lukasfehling d9a9bd1c0d Added a api endpoint for sending email notifications to users with their assigned assets 2022-11-15 18:17:51 +01:00
snipe 9a5d431962 Allow searching firectly for asset tag and serial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:13:26 +00:00
snipe 56c4fa7c27 Override display settings if field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:41:31 +00:00
snipe 1e34398c99 Permissions check on the field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:12 +00:00
snipe 1fa624420e Removed unneeded relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:49 +00:00
snipe 52dc5aa4ba Added field to controller and tranformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:26:59 +00:00
snipe 04b6f023ae Use new upload string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:57:50 -07:00
snipe 3c7d63c060 Disallow uploads if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:52:23 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 97aeb1fcec Use the generic file uploads strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:31:23 -07:00
snipe f1cb7ee410 Fixed some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:39 -07:00
snipe 84c0f50266 Added ComponentFilesController 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:10:04 -07:00
snipe 2106b64da6 Fixed some layout issues 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:06:49 -07:00
snipe 25f69a7bd2 Added consumable methods for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:28 -07:00
snipe 7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp 
Fixed (?) method name?
 2022-10-26 17:39:11 -07:00
snipe c1eee2cc72 Corrected string for invalid current password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 12:18:29 -07:00
snipe 12c7223bcd Renamed column back to assets_count for legacy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:39:03 -07:00
snipe 28b0d8cf0f Null expected_checkin on user bulk checkin and delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:54:37 -07:00
snipe e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe 4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
Godfrey M f2d4a61e3c removes dead space 2022-10-18 15:31:37 -07:00
Godfrey M 3f25a1bf61 removes dead code 2022-10-18 15:25:38 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
snipe 98f2e0271b
Merge pull request #11942 from nh314/develop 
Correct comparison logic
 2022-10-12 10:55:29 -07:00
snipe 0312ecf09d Sets nullable attribute on validation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 10:30:47 -07:00
Phan Nguyen 8ff109e9da
Correct comparison logic 
Comparison operator should be greater than or equal
 2022-10-08 12:54:15 +07:00
snipe 14b7319b63 Added start/end to sortable columns 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:07:07 -07:00
snipe f7a9be92ca Store data for start and end 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:26 -07:00
snipe 56ba8a7e24 Added API select fields and filters 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:16 -07:00
snipe bcebc1e33b Stylistic refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 16:37:33 -07:00
snipe 891b5b2882 Added routes, language 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 15:45:25 -07:00
Ivan Nieto Vivanco 25c10c3819 Filter non-asset items from download unaccepted assets report 2022-10-03 18:12:30 -05:00
snipe b07c4caa37 Extra whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 11:47:27 -07:00
snipe 5a7e35c0e8 Made a conditional escape according to .env 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 09:48:43 -07:00
snipe bae200edd7 Use EscapeFormula() in CSV export 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 09:29:17 -07:00
snipe 70c766e8b3 Added setting to choose dashboard type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 04:16:46 -07:00
snipe 0b2ce7be07 Fixed #11521 - switch to using status meta from status label name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 03:48:58 -07:00
Ivan Nieto Vivanco c0f83a7927 Delete not necessary conditional 2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco 5a1062f0f4 Delete debugging symbols (just kidding, it's just a dd() function) 2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco c32676596c Redirect correctly if not enough license seats exists to be checkout 2022-09-20 18:55:53 -05:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
Ivan Nieto Vivanco 41b75704e3 Removes format when changing to custom fields elements that doesn't need it 2022-09-15 11:21:02 -05:00
snipe 3192a68b06 Pulled assetlog from custom report controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 18:17:52 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco 3aff97ace1 Remove the previous user hashed password 2022-09-06 18:43:35 -05:00
snipe ae505ef44d Literally have no idea how this ever worked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-31 19:20:35 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -07:00
snipe dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance 
Send notifications when Acceptance Assets actions occur [sc-9917]
 2022-08-30 12:14:58 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
snipe 96ec96ff7f
Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule 
Fixed Validation error when empty default customfield values
 2022-08-25 17:54:04 -07:00
Ivan Nieto Vivanco 0d4e9c183b Save correct id in action log if the bulk-checkin is of type license 2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco 1ff2d15c4a Replace 'required' rule with 'nullable' to allow blank default customfields values 2022-08-25 18:16:50 -05:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
snipe 482a7b2a3a
Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500 
Fixed 500 error when sending unaccepted assets reminder
 2022-08-25 14:00:00 -07:00
snipe 6fde72a693 Log user out of other devices when they change their password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:24:26 -07:00
Ivan Nieto Vivanco 6e85c2e5cb Delete unused import 2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco 30d0125cbd Remove the rule 'required' for default values, if custom field is obligatory 2022-08-24 16:18:11 -05:00
Peace 94bbf2bf2f fixed translation string for canceled requests 2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco e5cc6ec972 Fixes error 500 if checkout_acceptances table have a created_at null column 2022-08-17 22:02:13 -05:00
snipe 91e824c5b0 Check for nullifying checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:25:07 -07:00
Ivan Nieto Vivanco a33ca39237 Figure out declined notifications 2022-08-11 16:00:21 -05:00
Godfrey M 814992eb7d allows company and location ids to be null 2022-08-11 12:47:40 -07:00
Ivan Nieto Vivanco 267997f0a6 Customize the notifications with the needed data 2022-08-11 14:01:11 -05:00
snipe acd666fdf5 Added notes to user consumables tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:34:07 -07:00
snipe 512348cc5a Added withInput() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:09 -07:00
snipe e3293151a2 Added note on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:59 -07:00
snipe e7c47408a7 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:57:42 -07:00
snipe 637604dfaf Fixed #8928 - add URL and ID to custom asset report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:51:47 -07:00
snipe 9acfceba29 Added relations to report search 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 23:50:10 -07:00
snipe cc92d342ea Added deleted at value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:37 -07:00
snipe 02caa13222 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:30 -07:00
snipe 975b4dee2f Added deleted header 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:17 -07:00
snipe 8e18ce74b2 Update method name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:12:18 -07:00
snipe 1b657ee995
Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout 
Error 404 fixed on submitting without mandatory field
 2022-08-02 17:19:22 -07:00
snipe e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports 
Adds options to include Deleted assets to custom asset reports
 2022-08-02 10:33:57 -07:00
Godfrey M ff080a2d8f replace checkboxes with radiobuttons 2022-08-02 10:27:55 -07:00
vishalkumar183 96b40a5edd Error 404 fixed on sumitting witout mandtory field 2022-08-02 18:44:16 +05:30
snipe af7ccf3beb Handle logout route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:17:40 -07:00
snipe 53ff28d2b0 Handle consumables route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:07:56 -07:00
snipe 4a4636bd03 Handle accessories route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:06:28 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
Godfrey M 842dafefec adds options to include Deleted assets to custom asset reports 2022-08-01 14:52:12 -07:00
snipe 78097df7ff Aplpies current time to checkin date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-21 21:45:25 -07:00
snipe 7313bca403 Checkin without deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:19 -07:00
snipe 6428dc5cd2 Removed duplicate supplier_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-13 13:08:15 -07:00
snipe 0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include 
adds a checkbox to exclude archived assets from custom reports
 2022-07-12 12:59:18 -07:00
Godfrey M 27039325f3 removed comments, because I forgot 2022-07-12 12:41:07 -07:00
Godfrey M 58c54cc3dc uses notArchived scope instead now 2022-07-12 12:20:11 -07:00
Godfrey M 48349071ed accounts for status_id as well 2022-07-12 09:46:44 -07:00
mikeroq 5efe45226d Fixes Email List of All Assigned being "successful" when the user has no email 
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
 2022-07-11 20:02:10 -05:00
snipe bb091760af Fixedd unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 17:11:28 -07:00
Godfrey M 75844c5942 adds a checkbox to exclude archived assets from custom reports 2022-07-11 09:56:58 -07:00
snipe 2518e2f0ee Removed > 300 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 17:09:56 -07:00
snipe 43e370f35a Move migrations further up 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 16:40:51 -07:00
snipe ee4f355e49 Changed logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 17:58:45 -07:00
mikeroq be8869978d Added import for Setting model 2022-07-04 07:29:01 -05:00
snipe 92d46edca3 Cleaned up logging output 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-01 13:33:58 -07:00
snipe 45c616639c Replicates #11444 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-01 11:21:02 -07:00
snipe 4e547a3639 Fixed typos :( 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:06:36 -07:00
snipe b910db0617 Fixed #11393 - reject acceptance if no file is present 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:01:58 -07:00
snipe 25cb32ca6a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 18:51:44 -07:00
snipe 1a423a252b Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:22:58 -07:00
snipe 7591f3f092 Added auth filter check regex 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:15:49 -07:00
snipe 2cace3c73a Added LDAP warnings on page load 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:08:12 -07:00
snipe 656efc5f92 Fixed missing trans() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:20:15 -07:00
Godfrey M cd9d2d0cec adds docblock 2022-06-29 13:01:29 -07:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe 5af6330398
Merge pull request #11417 from ntbutler-nbcs/master 
[Feature] - Add checkoutByTag API endpoint for assets
 2022-06-29 05:03:01 -07:00
snipe daaf8713d8 Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop 2022-06-29 04:58:26 -07:00
snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php
 2022-06-29 04:58:13 -07:00
snipe b04cf20735
Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop 
Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]
 2022-06-29 04:34:51 -07:00
Nathan Butler e28e7e37b8 Removed unneeded checks when searching for asset 2022-06-29 17:49:50 +10:00
snipe b590f29f33 Attempt a download via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:59:13 -07:00
snipe 1debdc47cf Backups endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:30:17 -07:00
snipe 53bc15900b Formatted show api 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:23:55 -07:00
Nathan Butler 67e9b7795a Added asset checkoutByTag API endpoint 2022-06-29 16:11:57 +10:00
snipe 52332bc9ed Include token ID in payload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:10:56 -07:00
snipe 9680b02bce Check that the user has permission to create their own API keys 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:09:18 -07:00
snipe 413487de80 Made method naming consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 21:32:12 -07:00
snipe 1158fa9ea8 Added personal access tokens to api 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 21:29:15 -07:00
snipe 3df9260ca8 Added additional filters for api indexes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 19:59:45 -07:00
snipe 71c8050883 Added additional search filters for location API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 19:07:11 -07:00
snipe c90ed9f25f Allow models uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:50:07 -07:00
snipe 14d8fb66aa
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value 
Only care about the custom field's converted name when updating the custom field itself
 2022-06-27 17:36:26 -07:00
snipe bf08e73f8f Removed comments and server side cookie info 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:36:09 -07:00
snipe baad3b9d58 Only care about the converted name when updating the custom field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 14:17:07 -07:00
snipe d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset 
Fixes #8155 -  improve the workflow during asset creation
 2022-06-24 18:53:07 -07:00
snipe 8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating 
Adds validation to custom fields' default values
 2022-06-24 18:11:16 -07:00
snipe d167d2a10f Disallow backup deletion and log attempt if not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:49:22 -07:00
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe 86d2c2b153 Small naming changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:11:59 -07:00
snipe f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users 
Added created_by to users
 2022-06-23 18:48:42 -07:00
snipe 9fd3541520 Missed on createdBy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:42:22 -07:00
snipe 3e559044b2 Changed method and scope names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:41:13 -07:00
snipe d8daec2e0a Added created_by results to user index API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:19:30 -07:00
snipe c9b81d65f1 Save the user id who is creating the user 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:19:08 -07:00