DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14061 commits 101 branches 268 tags 288 MiB
Commit graph

5515 commits

Author SHA1 Message Date
snipe 4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug 
Default label setup with custom fields
 2024-03-07 10:33:43 +00:00
snipe 4231058aa1
Merge pull request #14371 from Godmartinz/RB17900_notification_bug 
Adds User email check when sending Asset acceptance reminder
 2024-03-07 10:18:19 +00:00
Godfrey M ff7d25c0f2 simplified 1dbarcode logic 2024-03-06 15:30:53 -08:00
Godfrey M 5f0b7f328c if statement order change 2024-03-06 15:24:03 -08:00
Godfrey M 6559581bad conditions 1dbarcode to populate based on settings 2024-03-06 15:10:42 -08:00
Godfrey M d78262f52b resolved merge conflicts 2024-03-06 14:48:47 -08:00
snipe a85e2f7aad
Merge pull request #14372 from snipe/bug/sc-24158 
Added route parameter
 2024-03-06 19:45:33 +00:00
Godfrey M c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
Godfrey M 940f54dab1 revert some changes 2024-03-05 15:45:35 -08:00
Godfrey M d83827a44e bulk actions are handled before sorting 2024-03-05 15:43:41 -08:00
snipe 23f8e35716 Added route parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 20:39:56 +00:00
Brady Wetherington 5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00:00
Godfrey M 6c3a668400 checks to see if a user has an email before sending them a reminder email. 2024-03-05 10:30:24 -08:00
spencerrlongg ad0f873ece rm validation stuff 2024-03-05 11:58:00 -06:00
Godfrey M 95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
Godfrey M e926db76a0 fixes inconsistencies with generating labels 2024-03-04 10:26:38 -08:00
snipe 19e0fb7955 Reverting CSP change 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:25:14 +00:00
snipe 93e69ab0c6 Removed unsafe-inline and unsafe-eval 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:44:49 +00:00
snipe aaae952acb Use SVG cleaner on favicons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 10:17:57 +00:00
akemidx eb0657c953
Merge branch 'develop' into bug/sc-24812 2024-02-28 17:22:16 -05:00
snipe 7c3d8b896b Updated asset transformers/presenters to display requestable status 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:55 +00:00
snipe a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808 
Added tests around asset check in and added missing actions to the api controller action
 2024-02-28 13:34:12 +00:00
snipe 9fd6aea325
Merge pull request #14281 from Godmartinz/preview-label-fields 
Added better label previews with the new label engine
 2024-02-28 11:48:05 +00:00
snipe a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788 
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
 2024-02-28 11:47:46 +00:00
snipe ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728 
Added `min_amt` functionality to licenses
 2024-02-28 11:26:25 +00:00
snipe a059a42799 Added use Auth to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:14:48 +00:00
snipe 4ab7112988 Added validation and fillable attributes for min_amt 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:47 +00:00
snipe 4ffb7790df Added min_amt to API transformer/presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:07:18 +00:00
snipe 92b7c4b5ec Allow sorting on min_amt 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:05:13 +00:00
snipe dff7c43aed Added minimum account check for licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:05:02 +00:00
snipe 9efbcbbd5e Added min_amt to licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:04:42 +00:00
snipe 31fa0a7044 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:04:32 +00:00
snipe 0bd27d61b0 Added created_by to groups table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 08:15:59 +00:00
Marcus Moore 5084e5d3ef
Improve variable type 2024-02-27 12:23:26 -08:00
Marcus Moore a5516e3511
Improve trait name 2024-02-27 12:06:29 -08:00
Marcus Moore 0e460baf82
Improve readability 2024-02-27 12:03:36 -08:00
Godfrey M ef52777ffb removed conditional 2024-02-27 11:33:00 -08:00
Godfrey M b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08:00
akemidx 5ffade663a unstash 2024-02-26 18:41:58 -05:00
snipe a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
Marcus Moore 4caadcfa19
Clear pending checkout acceptances when checking in asset via api 2024-02-22 13:33:16 -08:00
Marcus Moore dba837b1d2
Move location migration logic to trait 2024-02-22 13:21:52 -08:00
Marcus Moore 714fc63050
Have legacy locations updated upon api asset checkin 2024-02-22 13:14:30 -08:00
spencerrlongg b6fa6cba22 note before switching tasks 2024-02-22 15:01:14 -06:00
Marcus Moore 2df026bcb5
Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
Godfrey M 6ee24a7527 remove unnecessary code reformat 2024-02-22 12:36:27 -08:00
Godfrey M e2dcee1959 cleans up dead code 2024-02-22 12:26:57 -08:00
Godfrey M 4fbea9512f puts textY inside of the forloop 2024-02-22 12:08:47 -08:00
Godfrey M b7850ab839 puts textY outside of the forloop 2024-02-22 12:08:04 -08:00
Godfrey M c0215baca5 minor changes 2024-02-22 11:41:04 -08:00
Godfrey M c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
spencerrlongg 14358651e4 pushing to test other branches 2024-02-22 13:28:23 -06:00
snipe f04aeb9f2b Fixed spacing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:31:02 +00:00
snipe dc902e7a5a Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:30:23 +00:00
snipe 4fc66e19bb Check for activeFile before trying to get header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:28:01 +00:00
snipe cb78451d6c Made website searchable on users table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 16:13:54 +00:00
snipe e8ad8a7448 Added email, phone icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 14:48:01 +00:00
snipe 3351998efd Only send notification if the item is assigned to a person 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 12:03:07 +00:00
spencerrlongg 20dbacd22f store good, update needs work 2024-02-21 21:33:34 -06:00
Marcus Moore aa2632fe46
Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
Brady Wetherington 8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10 
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
 2024-02-21 20:22:28 +00:00
Godfrey M 14c86d447b added filter to collectifunction 2024-02-21 11:38:03 -08:00
Godfrey M bee016e0be keeps example values in the example preview, fixes indent 2024-02-21 09:31:01 -08:00
snipe 54552fc95c
Merge pull request #14192 from inietov/fixes/api_issue_checkin_licenses 
Fixed #14183  API /hardware/:id/checkin doesn't return Licenses
 2024-02-21 11:35:06 +00:00
akemidx 9397372f87 permissions, but they are now all in their own column because reasons??? 2024-02-20 18:48:17 -05:00
akemidx 8bbf6da052 user block, trying to pick out ONLY permissions we wanna see 2024-02-20 18:25:41 -05:00
snipe ffa7d25fc0
Merge pull request #14308 from snipe/fixes/eager_load_relations_on_locations 
Eager load relations to determine deletability on locations
 2024-02-20 22:28:39 +00:00
snipe 04891c7c61 Eager load relations to determine 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 22:25:00 +00:00
spencerrlongg d67ff54f4b temporary decrypt, almost there 2024-02-20 16:20:03 -06:00
Marcus Moore ccec190985
Set label title properly 2024-02-20 13:59:50 -08:00
spencerrlongg 26728a85ad this seems to work for patches 2024-02-20 13:18:40 -06:00
spencerrlongg c6d85a1b0b allows arrays on checkbox values 2024-02-20 12:23:24 -06:00
snipe 71610fb20f
Merge pull request #14304 from snipe/feature/sc-24018 
Added ability to bulk delete locations
 2024-02-20 18:14:51 +00:00
snipe 1797480128 Few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:56 +00:00
snipe 972b198248 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:16 +00:00
snipe b2c8fbf349 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:04 +00:00
snipe c3f21d9292 Removed new checkbox selectability on users and assets - more complicated work to be done 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:41:58 +00:00
snipe 9b146ae1d2 Formatting for API response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:51 +00:00
snipe a32c679519 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:31 +00:00
snipe 1e602793b2 Added manager ID to filter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:23 +00:00
snipe a6a65b7523 Fixed locations isDeletable check 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:09 +00:00
Brady Wetherington a6dfd67cd7 Clean up the file extension on image file uploads 2024-02-19 16:51:23 +00:00
snipe 30f9acfcf3 Disallow uploads in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 16:11:17 +00:00
snipe cb5b691ec1 Check that the model exists before trying to access properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 15:34:57 +00:00
snipe 8f8edd4126 Added /backups/latest endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:35:09 +00:00
snipe 10bb844087 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:34:51 +00:00
snipe ba3baabb50 Fixed @return 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:34:36 +00:00
snipe c76fbe4edb Return 404 if download file isn’t found 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 13:05:44 +00:00
snipe 9847934de9 Better handle large downloads on backup API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 12:20:37 +00:00
snipe db73f80058 Starting off 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-16 18:57:50 +00:00
akemidx 4dd479dad7 formatting 2024-02-15 19:59:26 -05:00
akemidx d01e1e8eeb query works, but still only shows the asset once even if it's been checked out multiple times 2024-02-15 19:56:08 -05:00
akemidx e3ef737ac4 query first go 2024-02-15 19:15:27 -05:00
Godfrey M 69317fb403 Marcus is a beast and condensed everything into 4 lines 2024-02-15 13:26:47 -08:00
Godfrey M 1b80c8938a removed unnecessary if statement 2024-02-15 13:04:00 -08:00
Godfrey M dc77c01fd3 removes spacing 2024-02-15 13:00:38 -08:00
Godfrey M 83474d6e59 moves the array manipulation up the page where it should be 2024-02-15 12:59:47 -08:00
Godfrey M 529310c93a fixed typo in comment 2024-02-15 12:41:31 -08:00
Godfrey M 70f26f33a5 does a collect and map instead of a for loop for the array solution 2024-02-15 12:34:09 -08:00
Godfrey M 414bc10c40 removes the double for loop with a better solution 2024-02-15 12:02:08 -08:00
Godfrey M 250b0a7afb gives a better example with custom fields in label preview 2024-02-15 11:50:41 -08:00
snipe aef45a90b2
Merge pull request #14278 from uberbrady/allowlist_and_db_prefix_for_restore 
Allowlist and db prefix for restore
 2024-02-15 14:50:44 +00:00
Brady Wetherington 6a78706a3e New 'sanitize' version of backup-restore tool. Optional. 2024-02-15 13:27:18 +00:00
snipe 8adfa8dd83 Change exceptions to warnings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 12:28:12 +00:00
snipe 6c9001df09 Changed log level in checkoutable listener to info 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 12:20:14 +00:00
snipe d8b1eec91b
Merge pull request #14197 from inietov/fixes/component_licenses_checkouts_not_displayed_in_asset_history 
Fixes #14010 Adds Components and Licenses logs to Assets history view
 2024-02-15 09:57:46 +00:00
snipe b871813cfd
Merge pull request #14172 from spencerrlongg/bug/sc-23514 
Resolve Duplicate Activity Logs for Imports
 2024-02-15 09:54:43 +00:00
snipe 13d2af2155 Fixed ambiguous query on supplier_id in maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 09:51:14 +00:00
akemidx 232fad0145 query and progress notes 2024-02-14 20:00:23 -05:00
Godfrey M 5cbcac28b1 adds custom fields as an example in label settings 2024-02-14 16:53:38 -08:00
spencerrlongg 115e0fc119 implode submitted arrays to save 2024-02-14 13:15:23 -06:00
Marcus Moore d7aed2edc9
Remove unneeded code 2024-02-14 11:10:45 -08:00
Marcus Moore 7bfd02054b
Remove duplicate authorization check 2024-02-14 10:48:41 -08:00
spencerrlongg 1ceb703129 rm var 2024-02-14 12:44:09 -06:00
spencerrlongg fb28882f65 trim potential spaces 2024-02-14 11:59:14 -06:00
spencerrlongg d9c61fdb02 validation msg 2024-02-14 11:52:25 -06:00
spencerrlongg 72c118a70f cleanup 2024-02-14 11:41:46 -06:00
Godfrey M b136e9e29d fix the listener to fire when checking in 2024-02-14 09:16:20 -08:00
snipe 638071dadd Check the asset is not deleted when creating the permissions array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:38 +00:00
snipe 8a4c90ade8 Check that the asset is not deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:25 +00:00
snipe 71ebade641 Added serial and status to searchable relations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:59:10 +00:00
snipe b86b05c4fc Added serial and status fields to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:55 +00:00
snipe 35a70988cb Added sorting by status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:39 +00:00
snipe abc9ee22c6 Added serial and status to transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:48:02 +00:00
snipe e5ee9760c0 I don’t think we use these anyore because of the modifiers on date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:33 +00:00
snipe 7868a8c174 Added serial for API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:13 +00:00
snipe 03df4cec45 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:46:43 +00:00
spencerrlongg 25241542d2 progress, going to sleep 2024-02-14 02:12:31 -06:00
spencerrlongg 57a75e68b9 maybe i do the inverse here? 2024-02-14 00:52:50 -06:00
spencerrlongg dcf2168454 initial stuff, need to switch branches 2024-02-13 19:35:37 -06:00
akemidx c5e8d1c276 custom report tinker 2024-02-13 17:09:51 -05:00
akemidx 4093327b7f adding in Last Checkin Date to Hardware view and index 2024-02-13 16:52:12 -05:00
akemidx 4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05:00
snipe a76a69d085 Fixed incorrect string for location not existing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-13 20:23:32 +00:00
spencerrlongg d55358652b cleanup for pr 2024-02-13 13:45:56 -06:00
Brady Wetherington 955f75f733 Fixes for the prefix-guessing and sanitizing. 2024-02-13 16:45:24 +00:00
Brady Wetherington 70ef904951 Actually got this pretty close to being able to do a restore 2024-02-13 12:16:15 +00:00
Brady Wetherington fcf023e3d2 WIP: trying to get prefixing and sanitization working 2024-02-13 12:16:15 +00:00
Brady Wetherington 8c882ddead Starting to abstract out the SQL Streaming logic into its own class 2024-02-13 12:16:15 +00:00
Brady Wetherington 7d136f9970 Initial rough stabs at prefix removal and SQL sanitization 2024-02-13 12:16:15 +00:00
Marcus Moore 5b181ecea7
Remove old comment 2024-02-12 16:29:34 -08:00
Marcus Moore 728aaaab20
Ensure accessory check in emails are not sent when the setting is disabled 2024-02-12 16:22:59 -08:00
akemidx f7d0cecdac permissions query starto 2024-02-12 19:01:06 -05:00
snipe 111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146 
Fixes Default Location Being Set During Asset Creation and Checkout
 2024-02-10 11:47:46 +00:00
snipe 3868e711f4 Return null if asset was hard-deleted/purged 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 21:08:07 +00:00
snipe 479abd5231 Do not try to return a serial if the item doesn’t exist 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:53:33 +00:00
snipe 55b3050ca8 Re-applied previous withTrashed PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:37:18 +00:00
snipe 84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe fa47707974 Use withTrashed() to get the barcode on deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:26:49 +00:00
Godfrey Martinez 9dcd14a712
Merge branch 'develop' into general-hook_fix 2024-02-08 14:59:25 -08:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
spencerrlongg bcfa913450 condition makes this work, needs more testing 2024-02-07 20:03:37 -06:00
spencerrlongg 43d8474caa a note to remember this tomorrow 2024-02-06 17:45:46 -06:00
snipe bf674a0f4d Removed backticks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-06 15:58:36 +00:00
snipe b170755c3d Switch to bulk updating to handle audit interval updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-06 15:52:46 +00:00
snipe a43183ff96 Increased chunk 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-06 09:09:27 +00:00
snipe 3b36372a66
Merge pull request #14222 from marcusmoore/tests/company-get-id-for-current-user 
Added tests around getIdForCurrentUser method
 2024-02-05 22:04:08 +00:00
Marcus Moore 9e6e2de71e
Add docblock 2024-02-05 12:49:29 -08:00
snipe b49935701b Chunk data to reduce memory on large datasets when updating next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 20:48:24 +00:00
snipe 7b4020c5e9 Updated string paths for URL 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 19:09:16 +00:00
snipe 32c360f032 Re-added UI for load_remote 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:23:52 +00:00
snipe 1a480435de
Merge pull request #14190 from marcusmoore/bug/sc-24685 
Fixed consumable checkout via API not sending notification
 2024-02-05 17:16:57 +00:00
snipe 650aa25659
Merge pull request #14191 from Godmartinz/googlechat_webhook 
Added support for Google Chat notifications
 2024-02-05 17:10:54 +00:00
snipe f52b00256d
Merge pull request #14213 from snipe/fixes/orientate_on_exif 
Fixed FD-40296 - mobile uploads sometimes uploading with incorrect orientation
 2024-02-05 16:22:03 +00:00
snipe 5882d71f9b Fix company asset counts for dashboard widget 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 15:55:53 +00:00
snipe 3b948c7b7e Add orientate to image upload 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 14:29:43 +00:00
snipe d965fe759a Fixed #14211 - duplicate array key ldap_emp_num 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 12:28:24 +00:00
Ivan Nieto Vivanco 5e4a3379a9 Adds Components and Licenses logs to Assets history view 2024-02-01 01:35:25 -06:00
Godfrey M 8a5b469ff8 adds # to webhook channel trigger 2024-01-31 12:54:30 -08:00
Godfrey M ed06f32a7a adds # to webhook channel trigger 2024-01-31 12:53:56 -08:00
Godfrey M a876703f8f spacing 2024-01-31 10:48:48 -08:00
Godfrey M 01bb8d8c9a spacing 2024-01-31 10:48:23 -08:00
Godfrey M f452204d62 applies a conditional to have the the integration test button function properly 2024-01-31 10:47:25 -08:00
Ivan Nieto Vivanco 51ae485f20 When asset is checked-in the assigned licenses also are taken from the user 2024-01-30 19:44:38 -06:00
Godfrey M 0eabb147b2 adds google notif to consumable check out 2024-01-30 13:19:28 -08:00
Marcus Moore 2e0e39ccc8
Ensure notification is sent when consumable is checked out via api 2024-01-30 13:19:20 -08:00
spencerrlongg 63e733f0d6 changes from a note to a source 2024-01-30 15:14:59 -06:00
Godfrey M 2406d2cfdb adds google notifs to license seats check in and out 2024-01-30 13:14:24 -08:00
Godfrey M e074ca0bf9 adds google notifs to accessories check in and out 2024-01-30 12:57:45 -08:00
Marcus Moore 13c37e708f
Implement tests around consumable checkout 2024-01-30 12:43:20 -08:00
Godfrey M 87bce0c097 adds google notifs for asset check in and out 2024-01-30 12:38:17 -08:00
Godfrey M 22385a8e35 fix for general webhook not notifiying anymore 2024-01-30 10:47:18 -08:00
spencerrlongg d0a82adc3f changed condition 2024-01-29 20:44:26 -06:00
Marcus Moore 42ec2548c9
Fire event when accessory checked out via API 
Brings behavior in line with GUI controller
 2024-01-29 17:03:19 -08:00
Marcus Moore 7d45cfff2c
Ensure accessory available when checking out via api 2024-01-29 16:49:09 -08:00
Brady Wetherington 8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10 
A lot of changes here, but hopefully this works?
 2024-01-29 22:12:58 +00:00
Godfrey M dfa33f651a webhook test works 2024-01-29 12:58:09 -08:00
Godfrey M 30c2927987 merged develope 2024-01-29 11:21:00 -08:00
Godfrey M e8159d97fa changes 2024-01-29 11:12:25 -08:00
spencerrlongg 4cb804cf03 get rid of e() on store and update 2024-01-26 11:56:02 -06:00
spencerrlongg 2b0dd8851c probably needs more testing... but should work 2024-01-26 11:47:09 -06:00
Brady Wetherington 401e1842ee Fixed pluralization bug due to dashed-locale names instead of underscored 
Our locale directories are named things like 'en-US'. But the pluralization
code used by Laravel (through Symfony) requires locale names to be
in the format en_US. This change introduces a new Translator,
SnipeTranslator, which is a tiny set of changes against the built-in
one. It additionally adds a SnipeTranslationServiceProvider, which
loads up the new Translator.
 2024-01-26 15:40:55 +00:00
spencerrlongg 2deba17d91 that's all of 'em 2024-01-25 20:04:02 -06:00
spencerrlongg 3574ef5bb9 a few more imports, component sample 2024-01-25 19:54:53 -06:00
spencerrlongg abf13f1619 revert spacing 2024-01-25 19:37:59 -06:00
spencerrlongg 4a7df470f0 this works 2024-01-25 19:34:41 -06:00
spencerrlongg c9101f4d97 initial work, not working yet 2024-01-25 18:18:24 -06:00
snipe d6c61e1429 Removed attribute assigning blank EOL as 0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-25 21:34:20 +00:00
snipe 85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage 
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
 2024-01-25 20:14:40 +00:00
Brady Wetherington b39b575fec Add table-check; add command-description for Artisan command 2024-01-25 20:07:18 +00:00
Brady Wetherington 81b8243e1d Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute 2024-01-25 19:53:24 +00:00
snipe ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook 
Added support for Microsoft Teams Notifications
 2024-01-25 08:27:17 +00:00
Marcus Moore f5dafc477a
Avoid unnecessary model hydration on asset model show page 2024-01-24 16:14:51 -08:00
Godfrey M 6e9a46e582 working on Chat integration test 2024-01-24 15:50:36 -08:00
Godfrey M c65b32bcdb removed translation fixed via method 2024-01-24 14:49:42 -08:00
Godfrey M 1d3124f89f adding a test variable for test methods 2024-01-24 14:38:45 -08:00
snipe 105d4899f5 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 20:33:13 +00:00
Godfrey M ada1a593a4 add google placeholder 2024-01-24 11:29:32 -08:00
snipe ba680126bc Properly sort the results based on non-asset fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:06 +00:00
Godfrey M 00f07ac2ce add translations, brush up code 2024-01-24 10:38:06 -08:00
snipe 165f9545ac
Merge pull request #13924 from snipe/bug/sc-20167 
Set qty mutators
 2024-01-24 18:21:06 +00:00
snipe fff21416be
Merge pull request #14051 from akemidx/email_in_license_table 
Email in License Seat Table
 2024-01-24 15:37:43 +00:00
snipe 7668a6767d
Merge pull request #14102 from Godmartinz/seat-id-is-zero 
Fixed license seats id turning to zero when sorting by department
 2024-01-24 14:49:33 +00:00
snipe 661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations 
Adds translations for Label example
 2024-01-24 13:36:40 +00:00
snipe 49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501 
Improved radio button values in custom report form
 2024-01-24 13:22:48 +00:00
Brady Wetherington 3bc1b9038d Fix for LDAP syncing with base_dn and location_id and location 2024-01-24 11:54:29 +00:00
Godfrey M 49021d277c if not location add default location 2024-01-23 13:33:57 -08:00
Godfrey M f270672a3d added a location check, to prevent notif blowing up 2024-01-23 13:05:39 -08:00
Godfrey M 7c529df49b adds consumable checkout ms notification 2024-01-23 11:21:20 -08:00
Godfrey M e969f8808c adds licenses ms notifications 2024-01-23 11:10:04 -08:00
Godfrey M 5a46ef5d5b adds Accessory Check in out Notifcations, 2024-01-22 15:30:15 -08:00
Godfrey M f049cf5b06 adds Asset Check Out Notification 2024-01-22 10:57:22 -08:00
Godfrey M befab608f2 cha cha cha changes 2024-01-17 17:59:20 -08:00
Godfrey M cdcd868162 formats check in message for MS Teams 2024-01-17 17:31:23 -08:00
Godfrey M ce02e43ab2 fixed integration link, added some conditionals 2024-01-17 16:30:27 -08:00
Godfrey M 9f2af40ef2 adds MS teams integration test 2024-01-17 13:41:45 -08:00
Godfrey M 93ef8317e8 added payload, new MS webhook test method 2024-01-17 11:49:31 -08:00
Marcus Moore 8aa5cf530b
Improve radio button values in custom report form 2024-01-16 12:33:16 -08:00
Godfrey M 74dc17b4b9 adds translations for Label example 2024-01-16 10:47:45 -08:00
snipe adba2d5b6c Remove 7 day padding for expected assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-15 16:11:31 +00:00
snipe 66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation 
Fixed [FD-39640]: preserve sort order when generating asset labels
 2024-01-11 21:46:01 +00:00
snipe b94aaad9b5 Search on supplier name attached to maintenance 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-10 13:16:07 +00:00
Marcus Moore 423b636db9
Guard against non-integers being passed for company_id 2024-01-09 10:57:43 -08:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe 8541a342cb
Merge pull request #14108 from Godmartinz/asset_maintenance_scope 
Added supplier name as a searchable relation on the asset maintenance report
 2024-01-08 22:25:55 +00:00
Godfrey M 4184b271f7 adds Supplier as a searchable relation on the asset maintenance report 2024-01-08 14:22:35 -08:00
Brady Wetherington f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
snipe 2707c399ea Check that the asset exists before trying to get properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-08 12:42:05 +00:00
snipe f8a21bdb2d Moved limit and offset to after additional qualifiers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 11:59:31 +00:00
Godfrey M 43737263d4 removed that clause 2024-01-04 14:32:03 -08:00
Godfrey M 07eeaea3bf adds an additional clause 2024-01-04 14:30:59 -08:00
Godfrey M 249ff868e5 removes empty seats when sorting by department 2024-01-04 14:26:07 -08:00
Marcus Moore 742e183b02
Add guard against adding null values to query 
Since $request->filled(null) returns true
 2024-01-04 14:04:00 -08:00
spencerrlongg 901b1b83d0 rm code, was probably fixed through rules at some point 2024-01-02 18:27:17 -06:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe 38bd530fae Update en defaults for controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:44:20 +00:00
snipe ed9473c8ff Update ResetSettings command to en-US vs en 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 18:32:21 +00:00
snipe 97ba023152 Moved return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:47:06 +00:00
snipe a5947b8109 Added warning in middleware 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:34:45 +00:00
snipe 4a0d4f5862 Moved static var up above 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:27:11 +00:00
snipe 1a0e1b5f6c Added default to helper per @marcusmoore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:23:11 +00:00
Brady Wetherington 12ed8800d1 Changed some spacing and added a comment as per Snipe 2023-12-19 20:06:48 +00:00
Brady Wetherington 82dd601661 Added back-migration for Big Locale Refactoring 2023-12-19 19:54:04 +00:00
snipe db138479aa Updated locale middleware for mapping 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:43:22 +00:00
snipe 081bd69d5a Added helper method to map values 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:43:05 +00:00
snipe 2226bd2cd7 Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 14:03:55 +00:00
snipe fe51d0ef79
Merge pull request #14055 from snipe/bug/disallow_arrays_for_model_id_in_api_hardware_update 
Make sure we're getting an object instead of a collection on Asset API for model_id
 2023-12-19 13:30:54 +00:00
snipe f9139e0f10 Changed to use instanceof 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 13:25:32 +00:00
snipe 79ad598673
Merge pull request #14050 from marcusmoore/add-logging-to-checking-alerts-command 
Added log message for who is being sent expected checkin notifications
 2023-12-19 13:14:04 +00:00
snipe f13c1a53ef Get an object instead of a collection 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 12:51:35 +00:00
snipe f08ce34036 Fixed translation string in JSON 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 12:31:55 +00:00
akemidx 85bfbf8bc4 email in table, shows in export 2023-12-18 20:15:06 -05:00
Marcus Moore 1708897726
Add log message for who is being sent expected checkin notifications 2023-12-18 17:14:03 -08:00
akemidx 3fe3697a29 adding column, needs table join 2023-12-18 18:26:47 -05:00
snipe e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577 
Added Status Label names to Asset history/ Action log
 2023-12-18 22:41:02 +00:00
snipe 444c41bedb Fixed #14037 - record current time on accessory checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 16:39:18 +00:00
snipe 130be26820
Merge pull request #14031 from snipe/bug/ldap_undefined_search_base 
Fixed undefined $search_base
 2023-12-15 13:33:34 +00:00
snipe 421802893e Added new fields to action report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 10:45:22 +00:00
snipe 7aabf94a35 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:43:38 +00:00
snipe f5f136b9b5 Added fields to history views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:31 +00:00
snipe a90b04c905 Allowed sorting on user_agent, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:08 +00:00
snipe 40052e99a7 Added user agent to log method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:39 +00:00
snipe 70303c2b2d Added searchable fields, improved formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:25 +00:00
snipe 5df6575c37 Fixed undefinted $search_base 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 00:11:02 +00:00
snipe 016ca1adc1 Fixed HTML for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:27:50 +00:00
snipe b53a4c366e Removed escaping on notes on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:26:41 +00:00
snipe e894138fd4 Added $user->created_at to API user create method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 12:26:02 +00:00
snipe 631dd58de1 Added model name and number to quickscan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 04:23:04 +00:00
snipe e7a9c7ec99
Merge pull request #14008 from akemidx/sc20532_change_log_level 
Change log level on status label colors above 256
 2023-12-08 09:01:28 +00:00
snipe aa4aaf69b0 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-08 08:58:45 +00:00
akemidx f112e31b46 changing log level from ERROR to LOG 2023-12-07 17:56:10 -05:00
akemidx dc83689553 changing log level from ERROR to LOG 2023-12-07 17:50:25 -05:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
Brady Wetherington 6bd351c5d8 Whoops, didn't even add changes - duh 2023-12-07 14:08:15 +00:00
spencerrlongg f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
spencerrlongg 18720b3302 safety stuff 2023-12-05 20:36:59 -06:00
spencerrlongg 12e546e63a everything working, cleanup 2023-12-05 20:22:20 -06:00
spencerrlongg c28936fefb almost there... problem with update button 2023-12-05 17:39:35 -06:00
spencerrlongg 080d196138 buttons work now after style tags removed 2023-12-05 16:41:25 -06:00
spencerrlongg d3967b37cd this is a start, buttons not working? 2023-12-05 14:52:14 -06:00
Godfrey M b90cfba796 adds status label id to line change 2023-12-05 11:56:54 -08:00
Godfrey M 49342a4542 added status names to asset history 2023-12-05 11:50:43 -08:00
snipe 0089ea2321
Merge pull request #13882 from marcusmoore/fixes/jquery-validation 
Fix client side validation in the v7 branch
 2023-12-05 17:26:48 +00:00
snipe 3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907 
Convert Vue Personal Access Tokens to Livewire
 2023-12-05 16:45:16 +00:00
snipe 1e46ecc2ee Added eula-pdfs to allow-list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-04 15:33:56 +00:00
spencerrlongg 2d57b9399c more cleanup 2023-11-30 16:20:48 -06:00
spencerrlongg 6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
spencerrlongg 68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg 88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
spencerrlongg 133c469e36 organization 2023-11-30 14:25:58 -06:00
spencerrlongg 7e780c1187 cleanup rules formatting 2023-11-30 12:20:02 -06:00
spencerrlongg df954a3af2 return types 2023-11-30 12:06:58 -06:00
spencerrlongg 135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06:00
spencerrlongg d794608a09 note 2023-11-29 15:04:52 -06:00
spencerrlongg c3492f1699 fixed eol, add calculated eol/eol explicit tests 2023-11-29 14:57:31 -06:00
spencerrlongg 9d8433bd6d a couple quick things 2023-11-29 13:15:41 -06:00
snipe 3152df2c48 Created mutator for requestable attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-29 10:07:47 +00:00
snipe c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix 
Fixed status and model in bulk edit
 2023-11-29 09:40:03 +00:00
spencerrlongg b17078fffd a couple notes 2023-11-28 22:15:13 -06:00
spencerrlongg c886fb555b checkout on store tests almost done 2023-11-28 22:11:20 -06:00
spencerrlongg 15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
spencerrlongg cba5f869c0 standardize some of the validation rules, fix int/string issue 2023-11-28 21:19:19 -06:00
spencerrlongg 4aae82fa38 cleanup validation rules a little 2023-11-28 17:28:17 -06:00
akemidx 2a54797dce permission level proof of formatting 2023-11-28 17:58:37 -05:00
akemidx 9770016eec beginning of permission groups export 2023-11-28 17:47:36 -05:00
spencerrlongg 75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06:00
snipe 899890b224 Use update array nomenclature 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:25:35 +00:00
snipe 2d4a14d4bb Fixed from rebase :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:55:41 +00:00
snipe 3b9f069627 Switched back to old version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:54:42 +00:00
snipe 2c6b957fbe Removed unused query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:28:37 +00:00
snipe 6ae03a204b Added the model info back in 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:21:14 +00:00
snipe c91713e20a Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:55 +00:00
Brady Wetherington c71726c83e Whoops, left in some debug lines 2023-11-28 13:52:07 +00:00
Brady Wetherington ca430ec9b3 Modified re-crypter to also work when given a CLI old-key 2023-11-28 13:49:58 +00:00
snipe 9d786d9386 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:43:33 +00:00
snipe 4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe f9d5c451bc Committing this for now - not done 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe 5574218966 More FAFO - cleanup needed, but model_id works now 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe c997ae44c2 FAFO troubleshooting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
Brady Wetherington 6210716199 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-27 13:04:39 +00:00
snipe 1217bff4b6
Merge pull request #13947 from snipe/fixes/refactor_checkout_with_bad_category 
Refactored checkout for items with bad or missing category
 2023-11-23 16:59:51 +00:00
Brady Wetherington 8916c976e1 Merge branch 'develop' into scim_active_flag 2023-11-23 16:36:17 +00:00
Brady Wetherington 7b12d511f8 Force active flag to be returned as true or false 2023-11-23 16:34:03 +00:00
snipe 81b2273c37 Refactored checkout screen to redirect if invalid category 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:28 +00:00
snipe 31f429e1c4
Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg 
Escape the asset tag before passing it to the view
 2023-11-22 23:21:54 +00:00
snipe 1307ef19cf Escape the asset tag before passing it to the view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:20:47 +00:00
snipe aed6b531cb Derp. Extra return statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:05:38 +00:00
snipe ba127be344 Use saveQuietly to prevent double entries 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:00:30 +00:00
snipe f922d0518e Added allow list - quiet the observer down for magical laravel things 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:35:34 +00:00
snipe 45d9119733 Removed debugging/comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:32:34 +00:00
snipe e269415fec Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:55:44 +00:00
snipe 8481768c3d Save quietly for login methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:42:21 +00:00
snipe d3175b2ca4 Removed remember token from changed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:39:06 +00:00
snipe a8123db4fb Fixed comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:35:12 +00:00
snipe b1e782d2f0 Small nits picked to make Brady happy 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:34:39 +00:00
snipe 58679a13eb Use updated icons for activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:07:07 +00:00
snipe 22246dd099 Unset the specific arrays we don’t want to keep 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:50:46 +00:00
snipe a7f76f9860 Hide certain fields from changelog 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:28:58 +00:00
snipe 8b79a8afdf Added user observer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:22:05 +00:00
snipe 20c0f687e9 Added restored to asset observer, removed manual logging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:09:10 +00:00
snipe d06cfe6502 Changed verb to “restore” from “restored” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:08:41 +00:00
snipe e2d0136336 Fixed goofy translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:14:44 +00:00
snipe 6a3ab526de Refactorer API controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:04:24 +00:00
snipe 19877244cd Added/refactorerd isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:03:26 +00:00
snipe f7ccef16e7 Refactorer controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:02:47 +00:00
snipe 2353c8199c Set qty mutators 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 15:25:22 +00:00
snipe 0d29ac9856 Fixded gate return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 13:48:20 +00:00
snipe a08dcbdfdb Quick revert for #13830 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 12:25:42 +00:00
snipe d6a337a584 English hard 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:23:17 +00:00
snipe 83ee07cca1 Created mutator on category checkin_email 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:14:04 +00:00
snipe 68ac1aaae0 Additional comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:36:11 +00:00
snipe 6a2ab2cfb2 Removed line break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:10:19 +00:00
snipe 590cd0c71f Added Validator::replace() for friendlier interpretation of validation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:59 +00:00
snipe 766eee78b2 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:47:49 +00:00
snipe 2b9e4110bc Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:37:56 +00:00
snipe 4eb435e148 Use unique_undeleted instead of unique_serial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 12:36:11 +00:00
snipe b02c60c2ce
Merge pull request #13898 from Azooz2014/develop 
Fixed #13850: Too few arguments to function in App\Importer\UserImporter::fetchManager()
 2023-11-20 15:41:04 +00:00
snipe 01fec1d6bb Redirect back to the specific consumable for correction 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:39:39 +00:00
snipe 7c88601066 Grab the API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:31:39 +00:00
snipe fe2cfa0d38 Redirect if category is missing or invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:28:44 +00:00
Abdelaziz Faki 2c62a7e78d
Fixing #13850 UserImporter bug 2023-11-19 19:59:01 +03:00
snipe e41a16dbf3
Merge pull request #13879 from Godmartinz/location_search_bug 
added user location scope
 2023-11-19 07:01:59 +00:00
Godfrey M 01f4aa018f fixed query 2023-11-16 11:20:14 -08:00
Godfrey M f9baeefbaf allows to search full name 2023-11-16 11:14:42 -08:00
Godfrey Martinez 5569c2ba4a
Merge branch 'develop' into ldap_sync_bug 2023-11-16 10:02:56 -08:00
Godfrey M 2f12a9cfe2 add a conditional around location_id to fix bug 2023-11-16 09:52:44 -08:00
spencerrlongg af3417d6cc add return type 2023-11-16 11:42:37 -06:00
spencerrlongg c3e02286d3 i can't blame this on livewire - animations or something? 2023-11-16 11:24:54 -06:00
Spencer Long 19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907 2023-11-15 20:37:15 -06:00
spencerrlongg 9cf81c7ad4 cleanup, validation 2023-11-15 20:29:14 -06:00
spencerrlongg 6c6417e595 ok, maybe i do like livewire 2023-11-15 20:19:03 -06:00
spencerrlongg efa8ba5965 nice, just need frontend work now 2023-11-15 17:24:54 -06:00
spencerrlongg af144a5184 cleanup 2023-11-15 16:55:21 -06:00
spencerrlongg 9b31ae3146 create mostly working 2023-11-15 16:51:09 -06:00
spencerrlongg eaa68327f7 SINGLE QUOTES 2023-11-15 16:27:01 -06:00
spencerrlongg b1f75a3bb3 remove unused import 2023-11-15 13:20:17 -06:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
spencerrlongg 0924a53789 quick fix 2023-11-15 12:28:30 -06:00
Godfrey M c9d46856a3 added name back 2023-11-14 15:00:11 -08:00
Godfrey M 6d65f6646f allows validation to ignore self and update 2023-11-14 14:55:51 -08:00
Marcus Moore 34cd106357
Apply validation 2023-11-14 12:25:18 -08:00
Godfrey M 57019e170f adds user location scope, still needs fine tuning 2023-11-14 11:49:00 -08:00
spencerrlongg 9f303cc116 playing around with livewire 2023-11-14 11:50:27 -06:00
Brady Wetherington f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
snipe 73ebd9017f Added default map back to the importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 14:37:48 +00:00
spencerrlongg fbfc817c5f just some cleanup 2023-11-13 19:47:03 -06:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean 
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
 2023-11-13 20:22:52 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00