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

3749 commits

Author SHA1 Message Date
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 50431c046f Fixed missing slash in stdClass 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:04:06 +00:00
snipe ae259f36ae
Merge pull request #12106 from fernando-almeida/develop 
Fix HTTP AssetTransformer to generate an empty object for missing custom fields
 2022-11-15 15:54:43 +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
Fernando Almeida 47ee2a8153 Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array. 2022-11-14 16:31:08 +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
Godfrey M 92ae271292 adds validation for department names at Company locations 2022-11-09 13:11:33 -08:00
snipe 7c37c70164 Added new field to allowed_fields so that the API can change them if needed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:22 +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 6d5ace0458
Merge pull request #12049 from uberbrady/improve_scim_externalid_support 
Fixed writes to the `externalId` from SCIM
 2022-11-02 15:43:55 -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 3d3a4b02fc Added helper method for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:34 -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
Brady Wetherington 4e5c878b73 Needed to fix the way we write externalId from SCIM 2022-10-31 19:15:08 -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 a94f1c4a64 Cleaned up and added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:15:52 -07:00
Brady Wetherington 1e3281c76c Add externalId support to SCIM integration 2022-10-25 14:19:01 -07:00
snipe 3b16157d6b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 17:43:53 -07:00
snipe 4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
Brady Wetherington bc78d341a0 Caches manager lookups in LDAP for performance boost 2022-10-20 16:52:40 -07:00
Brady Wetherington 12d86bd6e2 Erroneous line-break removal - re-add 2022-10-19 19:01:52 -07:00
Brady Wetherington c4f11de90d Remove incorrect comment. 2022-10-19 18:49:19 -07:00
Brady Wetherington 8fb61cf5f8 Try to better handle LDAP Manager settings that don't line up with what we expect 2022-10-19 18:36:16 -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
Godfrey M d359bcb88d adds proper spacing 2022-10-17 13:15:10 -07:00
Godfrey M 28059c878a gets the proper amount of months and fixes typo of the word depreciation 2022-10-17 11:16:29 -07:00
snipe b7bcfaccc9
Merge pull request #11834 from uberbrady/try_catch_notifications 
try/catch wrap notifications on checkin/checkout
 2022-10-13 14:20:22 -07:00
snipe ac055c01dc Use admin ID for audit log notification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 15:59:43 -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 9d641573b5 Make the APU return null instead of blank 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:01:04 -07:00
snipe bdfac1a345 Added start/end to the users API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:37 -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 cf62761d18 Added date casting and fillable to models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:57:59 -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 36484d50ef Fixed depreciation API call 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 17:07:42 -07:00
Brady Wetherington 420c216973 Added counts to Dashboard Pie Chart legends and tooltips 2022-09-29 13:20:58 -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
Katharina Drexel 4f5d536e32
Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring. 2022-09-28 14:52:02 +02:00
snipe 055a2f827f
Merge pull request #11872 from sunflowerbofh/tmp-replace-patchwork-utf8 
Fixed #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.
 2022-09-27 16:46:12 -07:00
snipe a7b83fc531
Merge pull request #11854 from inietov/fixes/location_issue_during_import 
Fixed #11847 404 error during Import if a checkout type of location is specified and no checkout location is passed
 2022-09-27 14:34:26 -07:00
Katharina Drexel 8316a4eb92
Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring. 2022-09-26 12:06:06 +02: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
Ivan Nieto Vivanco e267f5491a Adds a check for empty location values on import 2022-09-19 19:05:48 -05:00
snipe f75d348dc0 Fixed license policy method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:06:46 -07:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:39:47 -07:00
Brady Wetherington 1899e4d1e8 try/catch wrap notifications on checkin/checkout 2022-09-15 13:18:42 -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 ac4f91918e
Merge pull request #11771 from rnelsonee/PAT_test 
Fixed #11769: PAT Test hardcoded text
 2022-09-14 20:01:18 -07: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 6b6a079440 fixes current value and monthly depreciation on reports and calculations 2022-09-14 17:01:18 -07:00
Godfrey M a0624fe179 reworks the depreciation formula, includes months passed instead of months remaining 2022-09-14 16:00:21 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco d51eca20f0 Add min_amt field in Consumables and Accessories imports 2022-09-12 18:11:48 -05:00
Godfrey M 28bc97f29f one line away from this being over with 2022-09-12 11:40:16 -07:00
Ivan Nieto Vivanco 3aff97ace1 Remove the previous user hashed password 2022-09-06 18:43:35 -05:00
Rick Nelson 6e82de2f47 Fixed #11769: PAT Test hardcoded text 2022-09-01 11:21:02 -04: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
Godfrey M 70ac8af9c4 . 2022-08-31 09:53:20 -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
snipe 7fa9214beb
Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering 
Fixed the order expiring assets are listed in notifications
 2022-08-29 12:37:01 -07:00
Godfrey M ea63049b4b removed redundancy with raw query 2022-08-29 12:33:51 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
snipe 9cf5f30c77 Set safeMode to true and use helper for all parsedown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-29 11:26:47 -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 6f0f6c8042 Don’t prevent deletion if user has consumables checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:51:02 -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
snipe 2ad9c39090
Merge pull request #11730 from inietov/fixes/importing_licenses_field_mismatch 
Fixed #11679 Importing Licenses - Field Mismatch
 2022-08-24 17:31:12 -07:00
Ivan Nieto Vivanco c59fd7b8da Fix importer field mapping for command line 2022-08-24 19:20:23 -05: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
snipe 45f17fea8a
Merge pull request #11510 from sunflowerbofh/tmp-ldap 
Fixed #11509 allow-ldap-anonymous-bind
 2022-08-22 16:32:07 -07:00
snipe 3ac84eab58
Merge pull request #11651 from inietov/fixes/activity_report_search 
Fixed Search in activity report for full name in relation
 2022-08-22 16:23:50 -07:00
snipe 906a36dc1a
Merge pull request #11703 from julian-piehl/fixes/wrong-trans-string 
Fixed Translation String: wrong key at request canceled message
 2022-08-22 16:16:10 -07:00
Warren White ba7d6dde3f Fixed #11706: changes the display of managers username to First Last name 2022-08-19 10:17:25 -07:00
Warren White 4b9a91f55b Fixed #10565, #11086: correctly looks up Manager DN from AD Manager attribute and sets manager id 2022-08-19 09:09:03 -07: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
Ivan Nieto Vivanco 98bcd82108 Add the mail recipient from configuration in the CheckoutAcceptance model 2022-08-11 15:33:18 -05:00
Ivan Nieto Vivanco d2c486bb1e Create the mail template for the acceptance 2022-08-11 15:28:30 -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
Ivan Nieto Vivanco 0172fe6403 Add Notifiable trait to the CheckoutAcceptance Model 2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco 509bbbc685 Create Notifications classes for accepted and declined and add some necesary lang strings 2022-08-11 13:01:21 -05:00
Ivan Nieto Vivanco 8cee5060af Remove unused DB statement 2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco a7de97f060 Found a better place for the where condition 2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco c1074000f9 Add a concat to search for full name when the relationship search in the users table 2022-08-10 18:27:28 -05:00
snipe ef099aa644 Reverted notes to note since pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 16:09:56 -07: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 3ec77724d8 Added note pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:34 -07:00
snipe 024a014298 Changed notes to note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:19 -07:00
snipe c1e5d03340 Added pivot for note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:41 -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
Brady Wetherington b6adfa294c Fixed the active flag to be as it was in later v5 releases 
Originally implemented here:

https://github.com/snipe/snipe-it/pull/10610/files
 2022-08-10 12:55:30 -07:00
Godfrey M 92e6ea96b2 if eol is missing from asset model monthly depreciation will be recalculated 2022-08-09 15:05:15 -07:00
snipe bc4032c2cd
Merge pull request #11617 from inietov/fixes/components_wrong_remaining_inventory 
Fixed wrong calculation of assigned components
 2022-08-05 18:05:21 -07:00
Ivan Nieto Vivanco c055c91739 Change db query for an existing method 2022-08-04 09:20:20 -05:00
Ivan Nieto Vivanco ea8f12579d Calculate the proper amount of assigned components 2022-08-04 07:58:25 -05:00
snipe 5f93d7b3be
Merge pull request #11615 from inietov/fixes/autoincrement_in_importer 
Fix auto incrementing in CSV importer [sc-19366]
 2022-08-03 17:50:23 -07:00
Ivan Nieto Vivanco 9f0ecba9b9 Add autoincrementing asset tags to the import if the CSV column is empty 2022-08-03 12:48:48 -05:00
snipe 9acfceba29 Added relations to report search 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 23:50:10 -07:00
snipe 20fcf7a1e9 Added configuration change to maintenance types 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:43 -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 87bed9b294 Fixed typo in code comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:24:46 -07:00
snipe ac72b69ece Update method name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:12:28 -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 71facb1850
Merge pull request #11596 from snipe/fixes/unique_undeleted_for_custom_fields 
Use unique_undeleted instead of unique for custom fields
 2022-08-02 17:16:12 -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