Commit graph

187 commits

Author SHA1 Message Date
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
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
snipe 99cecee4b5
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui 2023-04-17 14:54:30 -07:00
snipe e0c53d8d09 Remove start/end dates form casts array
Signed-off-by: snipe <snipe@snipe.net>
2023-04-17 09:33:31 -07:00
snipe 6acce098c9 Added autoassign_licenses on user model
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 15:24:56 -07:00
Marcus Moore 6df8f0f35c
Merge branch 'develop' into bug/sc-15034 2023-04-05 11:49:53 -07:00
slong753 e126a75f7a pretty sure this was it 2023-03-29 21:37:26 -05:00
Marcus Moore 2dcf4e3d16
Standardize on sending anonymous notifications for asset checkouts 2023-03-23 16:31:40 -07:00
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco ad598425ef Adds format to the dates cast 2023-02-28 17:24:14 -06:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag
Added a checkbox to notate VIP status
2023-02-23 12:23:29 -08:00
snipe 81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report
Added images to emailed user inventory report [sc-19801]
2023-02-22 10:38:07 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
Ivan Nieto Vivanco d494afcf01 Add order by clause, to ensure assets and accessories are in order in the report 2023-02-21 21:24:19 -06:00
snipe de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
snipe d52d32fed9 Fixed visibility for constants and methods
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:44:02 -08:00
snipe 2da4578aa5
Merge branch 'develop' into slack_message 2023-02-01 13:43:09 -08:00
akemidx 90c1bfe03d fixing pr 2023-02-01 16:12:39 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
akemidx df31a76906 fixed apostraphe 2023-01-26 15:02:39 -05:00
akemidx 53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe 4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00