Brady Wetherington
8b52bad16f
Merge branch 'develop' into snipeit_v7_laravel10
2023-08-15 21:25:16 +01:00
snipe
01ab360ef3
Fixed accessory clone typo
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:39:09 +01:00
snipe
9af850dbaa
Re-apply a change that was dropped
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:27:47 +01:00
snipe
64342838fd
Return the user to the labels page on save
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 18:48:12 +01:00
snipe
443adc50da
Fixed unclosed brace
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 18:12:25 +01:00
snipe
e41368daac
Merge pull request #12050 from cram42/develop
...
New Label Engine
2023-08-15 17:58:57 +01:00
Godfrey M
d1efca2ae1
fixes conflicts
2023-08-15 09:28:42 -07:00
snipe
c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies
...
Add email to companies
2023-08-15 13:26:20 +01:00
Marcus Moore
dc1a8840f1
Ensure empty string is not passed to strpos()
2023-08-14 16:40:34 -07:00
Ivan Nieto Vivanco
96440834bd
Move the declinedCheckout function so it don/'t separate the class properties
2023-08-14 16:16:28 -06:00
snipe
12e9d2adeb
Fixed #13450 - remove escaping on saveing new custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-14 22:21:41 +01:00
Ivan Nieto Vivanco
8da2a8a79c
Allows to save signature for declined items
2023-08-14 14:58:10 -06:00
Ivan Nieto Vivanco
4796598bb6
Add declinedCheckout method to Accessory model
2023-08-14 14:35:31 -06:00
Robert-Azelis
30d33310ae
Update CompanyPresenter.php
2023-08-13 17:23:33 +02:00
Robert-Azelis
bbb8ecfee4
Update Company.php
2023-08-13 17:21:55 +02:00
Robert-Azelis
8988a5dfc3
Update CompaniesTransformer.php
2023-08-13 17:20:15 +02:00
Robert-Azelis
ed5b4ca0a2
Update CompaniesController.php
2023-08-13 17:18:25 +02:00
Robert-Azelis
07bafa9508
Update CompaniesController.php
2023-08-13 17:15:20 +02:00
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
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
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
Brady Wetherington
051830dff4
Fix to ldap_location attribute
2023-07-17 20:42:02 +01:00
Ivan Nieto Vivanco
88c40c9c14
Change the field name to the same the model uses
2023-07-17 12:08:10 -06:00
snipe
3078cab7ee
Added ability to show/hide custom fields in list views by default
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-14 09:09:43 +01:00
snipe
f51dd15893
Moved deleted scope down
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-14 07:44:19 +01:00
Marcus Moore
346ace9444
Allow users that have permission to edit their own location to see locations in select list
2023-07-13 17:37:46 -07:00
Ivan Nieto Vivanco
ecac4718fe
Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes
2023-07-13 16:02:47 -06:00
snipe
5aa99a15d8
Merge pull request #13288 from snipe/fixes/line_based_markdown
...
Added Inline markdown method
2023-07-13 13:16:50 +01:00
snipe
016502f637
Added notesFormatter
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-13 13:14:10 +01:00
snipe
5d1f294f0e
Added parseEscapedMarkedownInline to accessories API
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-13 12:03:01 +01:00
snipe
981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags
...
Better auto increment asset-tags [FD-32892]
2023-07-13 09:49:44 +01:00
snipe
44231fa52c
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin
...
Fixed #13167 Default location not being set/updated upon check-in
2023-07-12 19:14:53 +01:00
snipe
d3c44a462e
Merge pull request #13268 from inietov/fixes/license_importer_missing_dropdown_items
...
Fixed License importer missing Checkout to: Username and Checkout to: Email in dropdown [sc-23456]
2023-07-12 17:11:27 +01:00
Brady Wetherington
76191a09ed
Improvements to asset_tag auto-incrementing, with auto-fixups for gaps
2023-07-12 16:39:45 +01:00
Ivan Nieto Vivanco
e0df8cc4aa
Add admin role to show encrypted customfield values
2023-07-11 17:21:32 -06:00
snipe
6d3bf1e5f5
Added additional method for inline
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-11 11:41:58 +01:00
snipe
9b5a67e31f
Use $Parsedown->line instead of $Parsedown->text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-11 11:33:29 +01:00
snipe
ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations
...
Added phone, fax to departments, locations, companies
2023-07-11 11:15:13 +01:00
snipe
9dc7fc93fb
Small fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-11 11:14:19 +01:00
Ivan Nieto Vivanco
ec8cb1b09e
Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash
2023-07-10 16:34:00 -06:00
snipe
14c61e4c17
Added phone, fax to departments, locations, companies
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-10 19:44:21 +01:00
Brady Wetherington
8f2a17585e
Merge branch 'develop' into snipeit_v7
...
Had to do a lot of conflict work here, so this could get ugly :(
2023-07-10 16:53:35 +01:00
Ivan Nieto Vivanco
299e546021
Adds the Username and Email to License Importer dropdown
2023-07-06 18:36:13 -06:00
Ivan Nieto Vivanco
9591442f1e
Evaluate the radio input to update location only or default location too
2023-07-06 10:46:21 -06:00
Ivan Nieto Vivanco
743e852998
Add radio buttons to alter asset checkin location behavior
2023-07-06 10:38:48 -06:00
snipe
2faa73f983
Merge pull request #13169 from akemidx/license_sn_check1
...
Making Serial Number the logic checked against for new imports
2023-07-06 16:40:27 +01:00
Brady Wetherington
a6a89ddd6c
Also log(debug) the error - could be useful for troubleshooting
2023-07-05 14:31:08 +01:00
Brady Wetherington
1f4d2f1e4a
Properly return SCIM Exceptions
2023-07-05 14:27:10 +01:00
snipe
7937542dcb
Redirect if the license can’t be found
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 21:15:50 +01:00
snipe
fb9b3a5453
Switched from a colon to a hyphen to handle windows filesystems
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 20:32:20 +01:00
snipe
bcefe73c9c
Use proper alias for table scope
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 16:52:09 +01:00
snipe
a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset
...
Cancel requested assets without checkin/out [ch-17606]
2023-06-29 16:18:13 +01:00
snipe
16ce06a3cc
Merge pull request #13222 from snipe/feature/sc-23427
...
Fixed #13213 - Use the Helper::parseEscapedMarkedown in notes
2023-06-29 16:16:25 +01:00
snipe
4c3a306a6e
More shuffling of scopes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 13:35:41 +01:00
Ivan Nieto Vivanco
011726154c
Set rtd_location if a location is given at checkin
2023-06-29 03:16:59 -06:00
slong753
ea61f634fb
get rid of nice nullsafe
2023-06-28 16:48:52 -05:00
slong753
afe6fe207a
resolved, missed adding errors in a case
2023-06-28 16:45:18 -05:00
Ivan Nieto Vivanco
a4b8723dcb
Delete notes column map from assets importer
2023-06-28 11:38:51 -06:00
snipe
e1fdfd01f6
Merge pull request #13211 from marcusmoore/company-scoping
...
Improve testing around company scoping
2023-06-28 16:17:07 +01:00
snipe
4278471d81
Merge pull request #13207 from Godmartinz/half_year_dep_fix
...
adds half_year fix from jdickerson71388
2023-06-28 15:12:30 +01:00
snipe
8d8adc1639
Use the Helper::parseEscapedMarkedown in notes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-28 15:02:32 +01:00
Brady Wetherington
51424d01a9
Merge branch 'develop' into snipeit_v7
2023-06-28 14:25:33 +01:00
Marcus Moore
ab51857854
Check to see if model relationship exists before using it
2023-06-27 19:35:55 -07:00
Ivan Nieto Vivanco
8496e64e16
Adds ternary to set a quantity when needed
2023-06-27 18:37:22 -06:00
Ivan Nieto Vivanco
b4b84f91d0
Redirect to correct page after cancel action
2023-06-27 18:25:38 -06:00
Ivan Nieto Vivanco
1c29bd37a6
Added feature to cancel requests from the Requested Assets view
2023-06-27 18:11:10 -06:00
Ivan Nieto Vivanco
eb4d764601
Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want
2023-06-27 17:13:11 -06:00
slong753
2a352619f7
clean up
2023-06-26 16:25:48 -05:00
slong753
691faf6340
ok, this kind of works - pr needs some clean up
2023-06-26 14:56:07 -05:00
Marcus Moore
3cb0920411
Merge branch 'develop' into company-scoping
2023-06-26 12:32:10 -07:00
Godfrey M
114d946437
adds half_year fix from jdickerson71388
2023-06-26 11:26:46 -07:00
snipe
4f7b2836b5
Set table alias for model number sort scope
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-26 08:27:17 +01:00
Spencer Long
f646623a5e
Merge branch 'develop' into bulk_edit_custom_fields
2023-06-22 18:00:31 -05:00
akemidx
8df9db76bc
column ordering fix
2023-06-22 17:12:40 -04:00
akemidx
8725d40f8d
current value added to asset index page. translations for this in reports
2023-06-22 17:00:42 -04:00
snipe
8c6bde335e
Merge pull request #13196 from inietov/fixes/default_status_labels_when_import
...
Fixed issue when importing Assets and no status labels exists [sc-23359]
2023-06-22 21:34:25 +01:00
snipe
b2d74f7e95
Merge pull request #13186 from snipe/bug/sc-23386
...
Moved logic for tighter constraints when ids are passed
2023-06-22 21:32:36 +01:00
snipe
78d8e32a22
Fixed weird order number thing
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-22 21:16:24 +01:00
snipe
4029efebfd
Merge pull request #13159 from Godmartinz/audit_image_bug
...
fixed audit log image not appearing
2023-06-22 21:11:39 +01:00
Marcus Moore
8aae5beaba
Add explicit select back to query
2023-06-22 13:09:08 -07:00
Marcus Moore
a8133f62e8
Add explicit select back to query
2023-06-22 13:07:49 -07:00
Ivan Nieto Vivanco
67e47a7d8b
Add guard clause to obtain the default ID of imported asset's status label
2023-06-22 13:53:58 -06:00
Marcus Moore
ab5fed09db
Remove scopeCompanyables call from AssetsController@requestable
2023-06-22 12:36:43 -07:00
Marcus Moore
0a5e1e3190
Remove scopeCompanyables call from AssetsController@selectlist
2023-06-21 17:21:36 -07:00
Marcus Moore
fd55c99b87
Remove scopeCompanyables call from AssetsController@index
2023-06-21 16:29:44 -07:00
snipe
5d4e704fac
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-21 09:26:54 +01:00
snipe
2d9ddab3f0
Moved logic for tighter constraints when ids are passed
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-21 09:24:17 +01:00
akemidx
00fd541963
improve logging clarity
2023-06-15 15:09:14 -04:00
snipe
f890e1f8b1
Merge pull request #13171 from snipe/features/importer/allow_update_by_user_id
...
Accept user ID as authoratative field for updates
2023-06-15 20:08:20 +01:00
akemidx
eda5bbf305
fix to allow empty SN
2023-06-15 14:42:34 -04:00
snipe
21a27f43a9
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug
...
Added warranty confirmation to asset maintenance table
2023-06-15 19:34:16 +01:00
snipe
6c684bccd0
Accept user ID as authoratative field for updates
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-15 10:02:05 +01:00
akemidx
df6b4ff349
tagging code
2023-06-14 15:51:14 -04:00
akemidx
efaed3d02c
making serial number logic checked against for new imports
2023-06-14 15:32:47 -04:00
Godfrey M
ee50906e44
attempt to add warranty to api controller
2023-06-13 11:20:55 -07:00
snipe
157a4341ea
Merge pull request #13041 from snipe/features/refactor_importer_for_localization
...
Refactor importer for localization
2023-06-13 18:12:07 +01:00
Godfrey M
fc86530c94
uses the trueFalseFormatter now
2023-06-13 09:10:42 -07:00
Godfrey M
6dd7181d09
fixed audit log image not appearing
2023-06-12 12:10:19 -07:00
Godfrey M
69325beddb
adds warranty confirmation to asset maintenance table
2023-06-12 11:03:32 -07:00
Brady Wetherington
f5ff9b2208
Merge branch 'develop' into snipeit_v7 - 2023-06-12
2023-06-12 16:56:23 +01:00
Marcus Moore
8e6e525b47
Remove scopeCompanyables call from LicensesController
2023-06-07 16:09:45 -07:00
Marcus Moore
a18f5e7fc0
Remove scopeCompanyables call from ConsumablesController
2023-06-07 14:22:22 -07:00
snipe
b57730ee9d
Added missing assets_fields declaration
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-07 15:52:18 +01:00
Marcus Moore
48850f3597
Remove scopeCompanyables call from ComponentsController
2023-06-06 18:02:18 -07:00
Stefan Stidl
ad8c36a51a
fix: slack channel
2023-06-06 10:30:01 +02:00
snipe
7ae260b489
More license translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-01 19:51:06 +01:00
Ivan Nieto Vivanco
f9a20bc917
Replace join with left join in pertinent eloquent query
2023-06-01 12:08:51 -06:00
snipe
e431cd5146
Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value
...
Fixed #12978 Custom Field Checkboxes not holding assigned values
2023-05-31 10:55:37 -04:00
ak-piracha
1cdf089306
Fixes: issue #13073 : deleted component addearing in asset component tab fixed
2023-05-31 00:11:11 +09:30
Ivan Nieto Vivanco
f4947bfa93
Use trim() function when format the custom field values as array
2023-05-24 04:06:31 -06:00
snipe
5e96fd200f
Refactor to remove general_fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 20:31:53 -07:00
snipe
3ef081e739
Indenting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 19:28:42 -07:00
snipe
47fa490e8a
More translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 19:28:23 -07:00
snipe
55683c29dc
Removed method that does the same return
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 19:22:00 -07:00
snipe
f355a6e9e1
Added first name and last name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 19:21:31 -07:00
snipe
3e4426c68c
Clearer comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 19:20:52 -07:00
snipe
2e5486a62e
Merge pull request #13076 from marcusmoore/fixes/allow-multi-column-search-in-sqlite
...
Dynamically adapt concatenation searches for MySQL and sqlite
2023-05-23 16:27:12 -07:00
Marcus Moore
0a3d46824e
Automatically add table prefixes when building multi-column search string
2023-05-23 15:58:58 -07:00
snipe
61d5bd8567
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 14:57:15 -07:00
Marcus Moore
b2b6f0cf96
Use new dynamic scope where possible
2023-05-23 13:38:50 -07:00
Marcus Moore
054d71aedc
Add docblock
2023-05-23 13:37:04 -07:00
Marcus Moore
9078d4c71c
Add dynamic scope for prettier multiple column search
2023-05-23 13:35:19 -07:00
snipe
d4c5a4eb2e
More aliases
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 13:18:32 -07:00
snipe
62384260bc
Clarifying comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 12:57:40 -07:00
snipe
f2e9b41199
More user fields in asset importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 12:57:34 -07:00
snipe
479350ed7b
Removed unneeded mapping file
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 12:57:24 -07:00
snipe
d0f5a044ba
More refactoring
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-23 12:13:06 -07:00
Marcus Moore
05a2e568d7
Add comment
2023-05-23 11:37:09 -07:00
Ivan Nieto Vivanco
086265455d
Pass user count to the eloquent query
2023-05-23 11:53:09 -06:00
Marcus Moore
f40e722397
Add docblock
2023-05-22 17:44:17 -07:00
Marcus Moore
9b512648a3
Update searchRelations in Searchable trait
2023-05-22 17:33:19 -07:00
Marcus Moore
64e83ed9f5
Update scopeAssignedSearch in Asset
2023-05-22 16:54:54 -07:00
snipe
f9449aa81f
Merge pull request #13069 from marcusmoore/fixes/add-eager-load-to-asset-model-endpoint
...
Add eager loading to Asset Models controller
2023-05-22 14:39:32 -07:00
Marcus Moore
a6eeae6541
Eager load fieldset default values in asset model endpoint
2023-05-22 14:19:03 -07:00
snipe
96e86501ad
Additional alias fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-22 13:20:08 -07:00
snipe
4dfe6f0a28
Added gravatar, avatar, start_date and end_date to user importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-22 13:19:57 -07:00
snipe
511d83cc47
Added/fixed a few more translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-20 14:52:42 -07:00
snipe
18bedb736e
Removed item number, since not everything will have it
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-20 14:21:29 -07:00
snipe
1396e314c4
Updated arrays with translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-20 14:21:13 -07:00
snipe
b75109dcac
Added component mapping switch
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-20 14:20:49 -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
ffbde46180
Simplify sqlite query
2023-05-18 13:06:50 -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
Brady Wetherington
09fdc946a0
Merge branch 'develop' into snipeit_v7
...
Had to do some asset rebuilds, and a composer update
2023-05-17 17:37:10 -07:00
snipe
2c4c9a16c9
Refactored the static arrays into mount arrays for translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-16 22:31:58 -07:00
snipe
d228b7f347
Remove 99% of the defaultMap stuff (might pull all of this later)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-16 22:31:01 -07:00
snipe
3296716dfa
Added EOL date to importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-16 19:06:35 -07:00
snipe
f1575d2020
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif
...
adds translation to checkout notification
2023-05-16 17:25:50 -07:00
snipe
71234228b4
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to
...
removes assigned_to if archived
2023-05-16 17:25:24 -07:00
snipe
4ca914d773
Merge pull request #13038 from uberbrady/fix_asset_checkout_on_update
...
Importer fix for non-Location imports
2023-05-16 16:41:27 -07:00
Brady Wetherington
2eb34d423f
Importer fix for non-Location imports
2023-05-16 16:33:07 -07:00
snipe
02cacf76c6
Additional multi-select options for custom report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-16 13:58:21 -07:00
Godfrey M
8e3cbdad90
removes assigned_to if archived
2023-05-15 11:52:57 -07:00
Godfrey M
46d6783fc5
adds translation to checkout notification
2023-05-15 09:01:30 -07:00
snipe
0f3b77ee2d
Added multi-select option to custom report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 14:45:31 -07:00
slong753
5e34ffa2b0
wip
2023-05-10 14:08:12 -05:00
snipe
9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report
...
Added Multiselect of companies for custom reports
2023-05-10 11:36:21 -07:00
snipe
7c77f4a697
Extra debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 09:10:53 -07:00
akemidx
537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page
2023-05-10 09:30:54 -04:00
snipe
8bad72a80f
Added validation on google client ID
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:40:45 -07:00
snipe
788c03ef57
Hide client secret if app is locked
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:22:49 -07:00
snipe
7062583710
Check for http or https in avatar value
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:18:38 -07:00
snipe
2dd32d8785
Re-add the image update
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:18:27 -07:00
snipe
ff66a938c1
Clearer comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:18:15 -07:00
snipe
7f0e677908
Use normal translation style
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:18:05 -07:00
snipe
e8a0c7f2ce
Remove avatar update, since we don’t take URLs for that
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 01:59:33 -07:00
snipe
e950cf4279
Switch to using username as match for google login
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 01:58:36 -07:00
snipe
567a800c51
Added debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 01:47:52 -07:00
snipe
e5eb5932ca
Create constructor to override expected config variables
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 01:37:03 -07:00
snipe
3612526632
Disallow saving data if app is locked
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 01:14:54 -07:00
snipe
63bf93b786
Pulled redirect from settings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 00:56:04 -07:00
snipe
3fb5188037
Removed redirect option
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 00:54:46 -07:00
snipe
aefd330e4e
Added methods for google settings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 00:54:28 -07:00
snipe
b7e8ce3064
Changed redirect
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 00:54:14 -07:00
snipe
054a2ab9d4
Add validation and fillable fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 00:34:31 -07:00
snipe
c52b48c383
Google oauth login
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 00:14:28 -07:00
slong753
1d2596fc54
wip
2023-05-09 14:58:59 -05:00
snipe
b76c5206ff
Merge pull request #12986 from snipe/features/import_backup_filename
...
Pass filename to pre-import backup
2023-05-08 15:08:59 -07:00
snipe
332b017dcc
Pass filename for manual backups
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-08 15:00:02 -07:00
snipe
5960a5425d
Pass filename to pre-import backup
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-08 14:48:26 -07:00
snipe
f1d85c67f1
Make validation match database fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-08 14:12:54 -07:00
snipe
6486ea4fb7
Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model
...
Refactor of #12955
2023-05-08 13:14:02 -07:00
snipe
d685335aea
Merge pull request #12975 from inietov/fixes/import_asset_notes
...
Fixed Notes field doesn't get populate when creating/updating assets via Importer [sc-23222]
2023-05-08 13:11:50 -07:00
snipe
d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177
...
Fixes user name missing in accessory acceptance notifications
2023-05-08 13:04:37 -07:00
snipe
ba462d1e93
Check that the filename we pass ends in zip, add it if not
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-08 12:41:32 -07:00
snipe
85243423cf
Add optional filename to backup
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-08 12:20:43 -07:00
snipe
8b73fa0053
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-06 06:36:09 -07:00
Ivan Nieto Vivanco
fbb7c55450
Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models
2023-05-04 03:12:36 -06:00
Ivan Nieto Vivanco
89fbd60d97
Restore the 'Asset Notes' and 'Model Notes' in the Map Asset Import Fields form
2023-05-04 02:00:04 -06:00
Marcus Moore
96c6d8896f
Add additional information to acceptance notifications for assets, accessories, and consumables
2023-05-03 17:04:01 -07:00
Marcus Moore
4a0b3efd1f
Include user's name in Acceptance result notifications for accessories
2023-05-03 14:22:05 -07:00
Marcus Moore
f96d8fe674
Add CheckoutAcceptance factory
2023-05-03 14:21:13 -07:00
slong753
815c77f943
wip
2023-05-03 14:49:31 -05:00
snipe
fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130
...
Adds a checkout range for custom asset reports
2023-05-03 11:43:44 -07:00
snipe
fc53b56481
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset
...
Fixed Error 500 after sign and accept asset
2023-05-03 11:43:14 -07:00
snipe
b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
...
Added ability to auto-add fields to new fieldsets
2023-05-03 11:04:33 -07:00
snipe
ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import
...
Location importer via Livewire Importer
2023-05-03 11:02:06 -07:00
snipe
f5cd58e9b7
Unmix return type variables
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-03 10:57:02 -07:00
snipe
da4841987e
Use translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-03 10:55:30 -07:00
snipe
4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost
...
Added component costs to asset view
2023-05-03 10:49:03 -07:00
snipe
914b2658cc
Merge pull request #12943 from marcusmoore/fixes/avoid-loading-unused-models-for-report
...
Remove the loading of asset maintenances that are not used by view
2023-05-03 10:41:52 -07:00
slong753
cdda4a56d8
aha, ok thisd kind of works
2023-05-02 19:11:43 -05:00
slong753
b2c2097e8b
just more troubleshooting stuff, still no solution
2023-05-02 18:54:20 -05:00
Brady Wetherington
2f3ddaec20
Merge branch 'develop' into snipeit_v7
2023-05-01 18:09:12 -07:00