3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-05-01 12:15:46 +00:00
Commit Graph

122 Commits

Author SHA1 Message Date
7062962cc8 Show warnings on the dates if expired or terminated 2025-09-15 13:43:08 +01:00
319cb1bd1e Removed logging 2025-09-15 13:23:44 +01:00
58cda5ae6d Added scopes 2025-09-15 13:22:25 +01:00
850939367c adds translation warning message 2025-09-10 12:59:35 -07:00
db9f85e9da Merge branch 'develop' into checkin_non_reassignable_license
# Conflicts:
#	app/Models/License.php
#	resources/views/licenses/view.blade.php
#	tests/Feature/Checkins/Api/LicenseCheckInTest.php
2025-09-03 11:09:51 -07:00
3094e007ee Set session to remember checkout type
Signed-off-by: snipe <snipe@snipe.net>
2025-09-01 13:28:07 +01:00
b6d397bcca Updated ->present()->fullName() to ->display_name
Signed-off-by: snipe <snipe@snipe.net>
2025-08-25 14:57:34 +01:00
a5e37519f5 Merge pull request #17539 from grokability/add-file-uploads-to-maintenances
WIP: Add file uploads to maintenances
2025-08-10 11:13:19 +01:00
12be088c4f Merge pull request #17523 from Godmartinz/fix-create-new-rediret
Fixes #17457 Previous Page redirect option
2025-08-08 09:50:40 +01:00
38678803eb Removed unused controllers
Signed-off-by: snipe <snipe@snipe.net>
2025-08-07 18:22:45 +01:00
bd2acefecc rethought, keeping previous page as an option 2025-08-05 12:29:59 -07:00
7abc3a7d7d Only push to session if user exists 2025-08-05 10:57:07 -07:00
1db09a7953 Allow category_id in license export by category
Signed-off-by: snipe <snipe@snipe.net>
2025-08-01 15:21:12 +01:00
667bd7af0e fix checkout_to_type being null when checking in 2025-07-08 13:53:10 -07:00
55ebb4671f update check in and check out controllers 2025-07-01 12:44:26 -07:00
8a9cf07063 editing controllers and edit blades for other categories 2025-07-01 12:31:55 -07:00
d3d5230d0c add with trashed to user search 2025-06-17 19:15:13 -05:00
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
9824f43780 added other target options to accessories and assets 2025-04-09 10:50:42 -07:00
1ad96e891b added option logic to licenses 2025-04-08 11:50:45 -07:00
a617c0545e WIP license checkin
Signed-off-by: snipe <snipe@snipe.net>
2025-02-19 08:39:25 +00:00
22c58678c4 License checkout controller with route model binding
Signed-off-by: snipe <snipe@snipe.net>
2025-02-19 08:38:55 +00:00
4beaf6b3ec Added item
Signed-off-by: snipe <snipe@snipe.net>
2025-02-19 08:38:40 +00:00
f7d213052a Route model binding for resource groups
Signed-off-by: snipe <snipe@snipe.net>
2025-02-19 02:49:05 +00:00
5da8c86ec7 fix license query for bulk licenses checkin for assets 2025-01-22 10:55:41 -08:00
34e8360b10 moves counts to licenses, allows bulk check in of unreassignable licenses 2025-01-22 10:46:28 -08:00
2143952a1e removed unused models, castged unreassignable_seat, clean up in general 2025-01-21 11:43:47 -08:00
6bab6e7151 remove unintended change 2025-01-16 12:27:01 -08:00
d217c2e295 last rename 2025-01-16 12:24:32 -08:00
52bf0faaa5 renamed unassignable to reassignable_seat 2025-01-16 12:19:59 -08:00
f050864fb4 renamed dead to unassigned, replaced 0 and 1 with true and flase 2025-01-16 12:12:14 -08:00
f47a2b10c0 updated column name, updated Api license checkin and out 2025-01-16 11:53:15 -08:00
344b4e7d60 fixes test to check if checked in licenses is unavailable 2025-01-16 09:46:03 -08:00
7a23372489 adds migration for column unavailable, changes logic to utlize value 2025-01-15 15:36:12 -08:00
5e1562ae4c adds count on tabs and reports and index 2025-01-13 14:31:54 -08:00
8a0ed49623 allows checkin of unreassignable license seats 2025-01-13 13:35:48 -08:00
7aa5195e87 Add tests for license checkin 2024-12-16 14:39:24 -08:00
699476da90 Scaffold and implement some license checkin tests 2024-12-12 17:33:34 -08:00
787e651778 Fixed todos with log message
Signed-off-by: snipe <snipe@snipe.net>
2024-10-21 16:52:21 +01:00
ef9b6e3b07 Code cleanup
Signed-off-by: snipe <snipe@snipe.net>
2024-10-21 16:34:54 +01:00
822ea96dfd Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:31:46 +01:00
1582d81e5b Change user_id to created_by
Signed-off-by: snipe <snipe@snipe.net>
2024-09-17 22:16:41 +01:00
ff100c0b9f Added more tests
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 14:58:10 +01:00
5d7f1f77a3 Added redirect to checkin/checkout controllers
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 12:48:07 +01:00
759ab78f80 Added more redirects
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 11:27:36 +01:00
70d95877d8 Translations for license checkout errors
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 21:02:58 +01:00
ae9085b11f Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
2024-07-04 20:49:22 +01:00
fb233c0aa4 Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:38:15 +01:00
8b3ff5a82d Handle potentially deleted admin users in license export
Signed-off-by: snipe <snipe@snipe.net>
2024-05-23 08:39:15 +01:00
5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00