svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,178 Commits 118 Branches 300 Tags
develop
Commit Graph

288 Commits

Author SHA1 Message Date
snipe ab1a5c0241 FMCS: check for floater mode in user and company 2026-06-10 11:22:50 +01:00
snipe f4cac96358 Apply scope to print page 2026-06-09 12:18:50 +01:00
snipe 00d4d6c7a8 Don’t strip comany association if company_id is passed to the user (old integrations) 2026-06-03 12:30:08 +01:00
snipe 7bf8fd5eeb Fixed #19106 - tighten up user accessor to treat null and empty string the same 2026-05-29 10:55:53 +01:00
snipe 9b522b69ff Fixed #19112 - company list disabled 2026-05-29 09:13:03 +01:00
snipe 135db70b0f Fixed #19100 - check all companies a user belongs to for asset assignment 2026-05-29 08:50:34 +01:00
snipe ec67195014 Removed a few duplicate queries 2026-05-29 01:34:11 +01:00
snipe c0fe308d7d Fixed FD-55359 - sanitize CSS 2026-05-28 12:25:12 +01:00
snipe f8c084cde7 This is hacky - might need to revisit 2026-05-19 14:40:20 +01:00
snipe b16970a61e Merge pull request #18629 from Godmartinz/update-print-invtentory-view-with-assigned2assets 
Update print inventory view with indirect assignments table
 2026-05-11 18:27:25 +01:00
snipe 3d04324595 Added searchableRelationAliases to user model 2026-05-06 12:39:31 +01:00
snipe 9131dbf09b Added more filter options 2026-05-06 12:03:55 +01:00
snipe 74e831c4f0 Oh, Pint 2026-04-17 12:36:56 +01:00
snipe be36390b0f Display effective permissions on user view 2026-04-17 12:36:43 +01:00
snipe ce5de8fe06 Allow admin to resend unaccepted assets 2026-04-16 15:50:11 +01:00
snipe c7c6b41dab Added revoke to user model 2026-04-09 14:49:12 +01:00
snipe b9f6b2bbb8 Made user counts searchable 2026-03-27 20:36:45 +00:00
snipe 80b7ebd508 Moved adminuser method to the SnipeModel 2026-03-27 19:20:54 +00:00
snipe e290c70732 Added helper function 2026-03-23 14:03:54 +00:00
Godfrey M 8747ff32dd Merge branch 'develop' into update-print-invtentory-view-with-assigned2assets 
# Conflicts:
#	app/Http/Controllers/ProfileController.php
#	app/Http/Controllers/Users/UsersController.php
 2026-03-17 16:11:16 -07:00
snipe 9623fa4d87 Use pint on models directory 2026-03-13 15:55:28 +00:00
Godfrey M 11c8fd4d4c update scope for directLicense.category" 2026-03-10 12:41:19 -07:00
Godfrey M ab04f3de93 use inventory scope, add quantity to print blade 2026-03-10 12:35:34 -07:00
Godfrey M a2ec707f79 add licenses to indirect assignedment table 2026-03-03 12:53:37 -08:00
snipe 5e9e0b70db Fixes #18377 - make min value for names consistent 2026-01-05 12:51:49 +00:00
snipe fa98557225 Check that the permissions are really an array 
This accounts for weird data in the permissions column
 2025-10-30 13:34:50 +00:00
Marcus Moore 776ba19a1f Define default permissions array 2025-10-27 12:28:55 -07:00
snipe f052c8b44c Merge pull request #18076 from uberbrady/move_traits_into_directories 
Moved Traits into its directory and modify the FCO's to point to them
 2025-10-27 11:43:31 +00:00
snipe df68dca9dc Warn if user has individual permission overrides 2025-10-25 18:57:17 +01:00
Brady Wetherington 9e68497b63 Moved Traits into directory and modify the users to point to them 2025-10-21 16:45:58 +01:00
snipe b7193a06fd Normalize advanced search 2025-10-08 20:51:35 +01:00
snipe 7b5d90dd81 Moved model traits into proper directory 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 18:23:26 +01:00
snipe 07dbc6842c Are you KIDDING ME, Github?? 
This reverts commit c8e79aa5ca, reversing
changes made to e60f2b2332.

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:56:28 +01:00
snipe c8e79aa5ca Merge branch 'develop' into add-display-name-to-users-fixed 2025-08-25 15:28:20 +01:00
snipe e60f2b2332 Tightened up accessor code for better inheritence 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:00:10 +01:00
snipe 6503f9c667 Revert "Merge pull request #17650 from grokability/add-displayName-to-users" 
This reverts commit 4770e469b4, reversing
changes made to 29a18c7c8b.

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 20:23:47 +01:00
snipe 2d6270c697 Updated validation, switch to string() as db field type 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 19:19:29 +01:00
snipe ced30082a6 Added display_name as user field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:10:28 +01:00
snipe ef35a0f2f1 Fixed #10284: Added mobile phone to users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-11 18:38:22 +01:00
snipe 9e8eead71e Renamed routes and method names 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 13:29:48 +01:00
Marcus Moore ff39e8bd2c Merge branch 'develop' into snipe-it-17073-asset-requests-are-not-deleted-when-asset-is-deleted 2025-08-04 12:43:03 -07:00
snipe 5e8cc66f5c Added scope for admins and superadmins 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-01 18:45:07 +01:00
snipe 2eaaeb8259 Merge pull request #17423 from grokability/tighter-permissions-on-non-admins 
Tighter permissions on non-admins and demo modes
 2025-07-22 14:32:50 +01:00
snipe cd9f8be563 Optimize for when we already have the counts 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-22 13:25:16 +01:00
snipe a98d3fb4dc Check for the format of the permissions (string, object, array) 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-17 20:09:17 +01:00
Marcus Moore c926358e04 Delete requests when user is deleted 2025-07-16 13:11:59 -07:00
snipe 8a80d9009d Refomatted hidden array 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-16 12:24:48 +01:00
snipe 95f867b267 Code formatting fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-09 21:48:53 +01:00
snipe e5e586dc43 Attempt to generalize companyable in company scope 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 17:12:55 +01:00
snipe cd989768d4 Added HasUploads trait and remove uploads method for models 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-27 19:32:22 +01:00