lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17468 commits 1 branch 0 tags 220 MiB
Commit graph

208 commits

Author SHA1 Message Date
snipe
43c15ef134
Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
akemidx
d1cd670af5 oop forgot the user form bit 2025-02-06 18:05:22 -05:00
Tobias Regnery
4e0bcac1a1 Furhter validation for scoped locations 
There is a new validator introduced that checks on object update (assets, users, etc.) if the company matches the locations company.
In case of the creation of a new location it must be checked that the parent matches the own company.
On updating a location a check for every related object must be made to see if the company matches the location.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2025-01-24 11:12:11 +01:00
snipe
15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template 
Saved Custom Report Templates
 2024-12-19 22:43:59 +00:00
snipe
183a4d49d8 Refactor of #15235 - added accessory checkout to locations, assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:49 +00:00
Marcus Moore
7238238d1f
Use created_by instead of user_id 2024-10-23 16:40:03 -07:00
Marcus Moore
c313a78c3c
Remove outdated @since annotations 2024-10-22 17:04:23 -07:00
Marcus Moore
8bba11e1bb
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	resources/views/partials/forms/edit/category-select.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/status-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-09-17 15:26:35 -07:00
snipe
4debaaea39 Fixed #15504 - allow nulling/not changing locale in user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-16 14:31:10 +01:00
arne-kroeger
b18baf74d2 added options to checkout accessoires to locations and assets 
Added #14979: add checkout functionality to accessoires
 2024-07-29 10:54:53 +02:00
snipe
e34f3c7c2c Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:32:41 +01:00
snipe
2b2853a183 Added acceptance model 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:29:58 +01:00
snipe
52c4885335 Added method for checking if the user can edit their own profile 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:17 +01:00
snipe
bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
snipe
2f59bb74cd Prefaced fields with “users” for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 09:52:41 +01:00
snipe
5800e8d8e9 Added companyable trait 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:57:34 +01:00
snipe
623aa58163 Removed unused statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:57:25 +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
Brady Wetherington
f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe
f769e8247f Added ManagedUsers method, additional checks in isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:15 +01:00
Brady Wetherington
65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
snipe
3f5cc2507d Used updated_at instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:39:49 +00:00
snipe
5a85424295 Added created_at to license pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:33:04 +00:00
Brady Wetherington
5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +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
Marcus Moore
530ea474d1
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
 2024-01-23 13:55:07 -08:00
Marcus Moore
b74115b604
Add docblocks 2024-01-18 15:42:52 -08:00
Marcus Moore
9fcb1a2d0e
Rename SavedReport to ReportTemplate 2023-12-18 12:55:48 -08:00
Marcus Moore
c3b53b28e3
Allow saving custom reports 2023-12-11 14:19:03 -08:00
Brady Wetherington
6210716199 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-27 13:04:39 +00:00
snipe
19877244cd Added/refactorerd isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:03:26 +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 M
57019e170f adds user location scope, still needs fine tuning 2023-11-14 11:49:00 -08:00
snipe
2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled 
Fixed #13336 - Save unhashed password if no password provided
 2023-09-14 14:15:53 +01:00
snipe
b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe
2a93c38830 Don’t cast as boolean, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 16:40:28 +01:00
snipe
354550b52e Removed getCompleteNameAttribute(), modified getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:17 +01:00
snipe
b54e7dc3ee Fixed #13336 - Save unhashed password if no password provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 17:44:40 +01:00
Marcus Moore
0a3d46824e
Automatically add table prefixes when building multi-column search string 2023-05-23 15:58:58 -07:00
Marcus Moore
b2b6f0cf96
Use new dynamic scope where possible 2023-05-23 13:38:50 -07:00
Marcus Moore
2d86c8f030
Update advancedTextSearch methods in Asset and User models 2023-05-18 17:06:41 -07:00
Marcus Moore
85974c7f65
Apply formatting 2023-05-18 13:16:52 -07:00
Marcus Moore
d8d672c4c1
Move multiple column search function to Searchable trait 2023-05-18 13:05:40 -07:00
Marcus Moore
9cb0decf35
Adapt multiple column search based on database driver 2023-05-18 12:54:00 -07:00
snipe
f1d85c67f1 Make validation match database fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:12:54 -07:00
Godfrey M
97df39001d adds optional breakdowns for total cost 2023-04-19 17:51:37 -07:00
Godfrey M
6872f8da7b adding total cost to user view 2023-04-19 17:31:09 -07:00
Marcus Moore
15280c435e
Merge branch 'develop' into bug/sc-15034 2023-04-19 11:45:16 -07:00
Marcus Moore
2d56675ade
Merge branch 'develop' into bug/sc-15034 
# Conflicts:
#	database/factories/SettingFactory.php
 2023-04-17 17:22:55 -07:00