ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,691 Commits 84 Branches 293 Tags
ee31bfbcd4c35c69e97e8745bf49a928694cde99
Commit Graph

105 Commits

Author SHA1 Message Date
Godfrey M ee31bfbcd4 Merge branch 'develop' into checkin_non_reassignable_license 
# Conflicts:
#	app/Helpers/Helper.php
#	app/Http/Controllers/Api/LicenseSeatsController.php
#	app/Http/Transformers/LicensesTransformer.php
 2025-04-21 10:49:35 -07:00
Godfrey M 9824f43780 added other target options to accessories and assets 2025-04-09 10:50:42 -07:00
Godfrey M 1ad96e891b added option logic to licenses 2025-04-08 11:50:45 -07:00
snipe a617c0545e WIP license checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:39:25 +00:00
snipe 22c58678c4 License checkout controller with route model binding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:38:55 +00:00
snipe 4beaf6b3ec Added item 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:38:40 +00:00
snipe f7d213052a Route model binding for resource groups 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 02:49:05 +00:00
Godfrey M 5da8c86ec7 fix license query for bulk licenses checkin for assets 2025-01-22 10:55:41 -08:00
Godfrey M 34e8360b10 moves counts to licenses, allows bulk check in of unreassignable licenses 2025-01-22 10:46:28 -08:00
Godfrey M 2143952a1e removed unused models, castged unreassignable_seat, clean up in general 2025-01-21 11:43:47 -08:00
Godfrey M 6bab6e7151 remove unintended change 2025-01-16 12:27:01 -08:00
Godfrey M d217c2e295 last rename 2025-01-16 12:24:32 -08:00
Godfrey M 52bf0faaa5 renamed unassignable to reassignable_seat 2025-01-16 12:19:59 -08:00
Godfrey M f050864fb4 renamed dead to unassigned, replaced 0 and 1 with true and flase 2025-01-16 12:12:14 -08:00
Godfrey M f47a2b10c0 updated column name, updated Api license checkin and out 2025-01-16 11:53:15 -08:00
Godfrey M 344b4e7d60 fixes test to check if checked in licenses is unavailable 2025-01-16 09:46:03 -08:00
Godfrey M 7a23372489 adds migration for column unavailable, changes logic to utlize value 2025-01-15 15:36:12 -08:00
Godfrey M 5e1562ae4c adds count on tabs and reports and index 2025-01-13 14:31:54 -08:00
Godfrey M 8a0ed49623 allows checkin of unreassignable license seats 2025-01-13 13:35:48 -08:00
Marcus Moore 7aa5195e87 Add tests for license checkin 2024-12-16 14:39:24 -08:00
Marcus Moore 699476da90 Scaffold and implement some license checkin tests 2024-12-12 17:33:34 -08:00
snipe 787e651778 Fixed todos with log message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:52:21 +01:00
snipe ef9b6e3b07 Code cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:34:54 +01:00
snipe 822ea96dfd Use auth()->id() instead of Auth::id() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:31:46 +01:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
snipe ff100c0b9f Added more tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:58:10 +01:00
snipe 5d7f1f77a3 Added redirect to checkin/checkout controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:07 +01:00
snipe 759ab78f80 Added more redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 11:27:36 +01:00
snipe 70d95877d8 Translations for license checkout errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:02:58 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
snipe 8b3ff5a82d Handle potentially deleted admin users in license export 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-23 08:39:15 +01:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
Godfrey M 25f1167c9d adds company scoping to license export 2024-04-22 10:38:55 -07:00
Godfrey M a2bca0e358 fixed comments 2024-04-10 15:05:21 -07:00
Godfrey M 0849262243 fixed notes 2024-04-10 12:19:34 -07:00
Godfrey M 17095feb33 fix typo 2024-04-10 12:15:48 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07: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
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +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
Marcus Moore a08e0bd547 Ensure notes are saved to the action log when licenses are checked in and out 2023-11-06 12:20:13 -08:00
snipe f685ba01b6 Reversed order of find 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 16:43:14 +01:00
snipe e5f5802235 Added tighter controls for matching log ID and item_id 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 15:17:03 +01:00
snipe 6fa0d42bc2 Fixed bug where license checkout/checkin notes were not being saved 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:40:18 +01:00
snipe b92327eb40 Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature 
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
 2023-09-14 12:52:13 +01:00
snipe f53db8ba75 Fixed #13562 - allow inline view for uploaded files 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:28:01 +01:00