3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-08-18 11:15:42 +00:00
Commit Graph

299 Commits

Author SHA1 Message Date
4675e4bbd9 Superadmin: Added ability to login (impersonate) another user 2026-07-07 20:49:19 +01:00
b2d5247ebe Merge remote-tracking branch 'origin/develop' into _parent-company-functionality
# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
2026-07-03 13:36:54 +01:00
d1a635d8b9 Merge remote-tracking branch 'origin/develop' into _floater-mode-superuser-gate 2026-07-02 13:54:24 +01:00
50b8e34bdd Added maintenance counts 2026-06-29 17:32:57 +01:00
2ee97645e4 Small fixes 2026-06-26 15:22:50 +01:00
d58e757d37 Reverter tighter scope, updated tests 2026-06-26 12:44:13 +01:00
b78aedeec2 Added stricter gate checks with FMCS and floater mode is on 2026-06-25 19:29:06 +01:00
c3119457fe Company API: Eager load on show API endpoint 2026-06-25 17:44:03 +01:00
91305f1a9d Added parent company capabilities 2026-06-25 15:15:54 +01:00
7e8c5bcf01 Styling: apply fallbacks for link colors properly 2026-06-17 18:06:33 -07:00
a6c82eec7b Location Scoping: Fixed ordering for company check on user save
The model save fires before companies are synced, so company_id is stale data, which was causing it to erroneously fail validation. the rule was always wrong in that context for updates. The form request owns this check now.
2026-06-15 15:18:09 +01:00
ab1a5c0241 FMCS: check for floater mode in user and company 2026-06-10 11:22:50 +01:00
f4cac96358 Apply scope to print page 2026-06-09 12:18:50 +01:00
00d4d6c7a8 Don’t strip comany association if company_id is passed to the user (old integrations) 2026-06-03 12:30:08 +01:00
7bf8fd5eeb Fixed #19106 - tighten up user accessor to treat null and empty string the same 2026-05-29 10:55:53 +01:00
9b522b69ff Fixed #19112 - company list disabled 2026-05-29 09:13:03 +01:00
135db70b0f Fixed #19100 - check all companies a user belongs to for asset assignment 2026-05-29 08:50:34 +01:00
ec67195014 Removed a few duplicate queries 2026-05-29 01:34:11 +01:00
c0fe308d7d Fixed FD-55359 - sanitize CSS 2026-05-28 12:25:12 +01:00
f8c084cde7 This is hacky - might need to revisit 2026-05-19 14:40:20 +01:00
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
3d04324595 Added searchableRelationAliases to user model 2026-05-06 12:39:31 +01:00
9131dbf09b Added more filter options 2026-05-06 12:03:55 +01:00
74e831c4f0 Oh, Pint 2026-04-17 12:36:56 +01:00
be36390b0f Display effective permissions on user view 2026-04-17 12:36:43 +01:00
ce5de8fe06 Allow admin to resend unaccepted assets 2026-04-16 15:50:11 +01:00
c7c6b41dab Added revoke to user model 2026-04-09 14:49:12 +01:00
b9f6b2bbb8 Made user counts searchable 2026-03-27 20:36:45 +00:00
80b7ebd508 Moved adminuser method to the SnipeModel 2026-03-27 19:20:54 +00:00
e290c70732 Added helper function 2026-03-23 14:03:54 +00:00
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
9623fa4d87 Use pint on models directory 2026-03-13 15:55:28 +00:00
11c8fd4d4c update scope for directLicense.category" 2026-03-10 12:41:19 -07:00
ab04f3de93 use inventory scope, add quantity to print blade 2026-03-10 12:35:34 -07:00
a2ec707f79 add licenses to indirect assignedment table 2026-03-03 12:53:37 -08:00
5e9e0b70db Fixes #18377 - make min value for names consistent 2026-01-05 12:51:49 +00:00
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
776ba19a1f Define default permissions array 2025-10-27 12:28:55 -07:00
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
df68dca9dc Warn if user has individual permission overrides 2025-10-25 18:57:17 +01:00
9e68497b63 Moved Traits into directory and modify the users to point to them 2025-10-21 16:45:58 +01:00
b7193a06fd Normalize advanced search 2025-10-08 20:51:35 +01:00
7b5d90dd81 Moved model traits into proper directory
Signed-off-by: snipe <snipe@snipe.net>
2025-08-28 18:23:26 +01:00
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
c8e79aa5ca Merge branch 'develop' into add-display-name-to-users-fixed 2025-08-25 15:28:20 +01:00
e60f2b2332 Tightened up accessor code for better inheritence
Signed-off-by: snipe <snipe@snipe.net>
2025-08-25 15:00:10 +01:00
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
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
ced30082a6 Added display_name as user field
Signed-off-by: snipe <snipe@snipe.net>
2025-08-19 12:10:28 +01:00
ef35a0f2f1 Fixed #10284: Added mobile phone to users
Signed-off-by: snipe <snipe@snipe.net>
2025-08-11 18:38:22 +01:00