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

6293 commits

Author SHA1 Message Date
snipe
df8f6a8d2b Correctly call the route for accessory index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-11 09:40:49 +01:00
Marcus Moore
e0b464dcec
Merge branch 'develop' into feature/custom-report-scoping 2023-08-09 13:03:05 -07:00
snipe
a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465 
Added messaging to category edit page to improve clarity around when users will be emailed
 2023-08-09 10:36:19 +01:00
Marcus Moore
c32f099053
Remove unneeded call to Company::scopeCompanyables 2023-08-08 17:22:15 -07:00
Brady Wetherington
6afbf1b152 Re-add the option for asset_eol_date as an import field 2023-08-08 17:45:33 +01:00
Marcus Moore
7c5a1b376e
Remove redundant Company::scopeCompanyables wrapper 2023-08-07 16:54:23 -07:00
Marcus Moore
f7b2075e9e
Add CompanyableTrait to Department 2023-08-07 16:54:02 -07:00
Marcus Moore
ae9cf1e5b6
Formatting 2023-08-02 18:24:32 -07:00
Ivan Nieto Vivanco
053d3fc9ed Prevent asset to be checked out if full company support is enabled and companies not match 2023-08-02 19:23:28 -06:00
Ivan Nieto Vivanco
9ca163e8cf Stop asset acceptances from shown to user if full company support is enabled and companies not match 2023-08-02 19:22:35 -06:00
Marcus Moore
3fd0853fd0
Ensure eula field enabled when not using default eula 2023-08-02 18:02:56 -07:00
Marcus Moore
896f038054
Set send email back to original value when eulas cleared 2023-08-02 17:03:56 -07:00
Marcus Moore
48979ce177
Disable send email when it should not be modified 2023-08-02 16:52:56 -07:00
Marcus Moore
e12935f7fa
Disable eula textarea when using global eula 2023-08-02 16:18:57 -07:00
Marcus Moore
6400034435
Improve variable name 2023-08-02 16:06:59 -07:00
Marcus Moore
269414e4f2
Automatically check the send email to user checkbox in certain conditions 2023-08-02 16:04:01 -07:00
akemidx
0bdd8a5917 fixing key names 2023-08-02 16:40:38 -04:00
Marcus Moore
dee6ebf8e0
Scaffold component test 2023-08-02 12:58:07 -07:00
Marcus Moore
105c94aea9
Implement toggling message when email will be sent 2023-08-02 11:36:20 -07:00
Brady Wetherington
0af205dade Put guard around assigning location via LDAP 2023-08-02 15:01:14 +01:00
Marcus Moore
6349d52803
WIP: migrate to livewire 2023-08-01 17:29:23 -07:00
Godfrey M
8a24a47475 removed unnecessary code 2023-08-01 09:45:48 -07:00
Godfrey M
fb52038e7c applies a check if a sync field is designated 2023-08-01 09:39:58 -07:00
Brady Wetherington
daed0b60bc Merge branch 'develop' into snipeit_v7_laravel10 2023-07-31 19:40:56 +01:00
snipe
ffb605a37c
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today 
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
 2023-07-31 15:04:22 +01:00
Brady Wetherington
4654f7aa37 Porting Snipe-IT v7 to Laravel v10 2023-07-31 14:07:12 +01:00
snipe
2e1c3fb51b
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields 
Fixed #11794 Admins Cannot View Encrypted Field
 2023-07-31 13:08:28 +01:00
Grant Le Roux
b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Ivan Nieto Vivanco
0a841ddbb8 Change component validator to the correct asset id we're passing in the API call 2023-07-27 20:22:13 -06:00
Brady Wetherington
70e87dad1c Merge branch 'develop' into snipeit_v7 2023-07-27 16:21:31 +01:00
akemidx
e35dd2daa1 asset_eol_date stuff 2023-07-26 17:45:18 -04:00
akemidx
f71b69a739 adding eol fields 2023-07-26 17:31:06 -04:00
Ivan Nieto Vivanco
c015264181 Adjust the license offset if it exceeds the total of license seats 2023-07-25 16:23:33 -06:00
snipe
a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page 
Delete button on asset view page
 2023-07-25 12:11:35 +01:00
Ivan Nieto Vivanco
cb4ed92639 Use Carbon date objects instead of casting using DB::raw() 2023-07-20 16:17:06 -06:00
snipe
540b09c506 Possible alternative to fixing #13296 - custom report failing when the model is busted 
Related: https://github.com/snipe/snipe-it/pull/13297
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 17:45:45 +01:00
Brady Wetherington
ba8d8a6f05 Merge branch 'develop' into snipeit_v7 2023-07-20 17:16:04 +01:00
snipe
1e09320ebe Check that $this->get_depreciation() returns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 16:30:07 +01:00
snipe
d7ac8ef618 Added manufacturer to licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 14:02:54 +01:00
snipe
244e4ec11f Added manufacturer back into license importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 13:48:51 +01:00
Tobias Franzius
90a344af0b Fixes #13341 Clean up correct seats on license delete 
Before this, we checked for the `id` collumn in the `license_seats` table, insteasd of
using `license_id` for this.

This way, we ensure that we only alter seats belonging to the correct license.
 2023-07-20 13:48:57 +02:00
Ivan Nieto Vivanco
ecf522243b Add the new rule to proper views and also in the Asset Transformer 2023-07-19 19:52:03 -06:00
Ivan Nieto Vivanco
705411eb4d Create the Gate that goes with the permission 2023-07-19 19:44:59 -06:00
snipe
a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets 
Current value added to asset index page
 2023-07-19 19:06:15 +01:00
akemidx
9e2987e680 changing book value to be NOT searchable or sortable 2023-07-19 13:44:31 -04: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
Brady Wetherington
605d267fe8 Merge branch 'develop' into snipeit_v7 2023-07-19 11:47:51 +01:00
snipe
a0a5ca1f40 Added strtolower for category type 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 08:56:17 +01:00
snipe
18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478 
Fixed the inability to load location select when editing profile
 2023-07-18 13:26:30 +01:00
snipe
6f8c3ca167
Merge pull request #13322 from uberbrady/fix_ldap_location_3 
Fix to ldap_location attribute
 2023-07-18 13:24:59 +01:00