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

1316 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Marcus Moore
05a2e568d7
Add comment 2023-05-23 11:37:09 -07: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
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
snipe
8bad72a80f Added validation on google client ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:40:45 -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
054a2ab9d4 Add validation and fillable fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:34:31 -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
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
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
Marcus Moore
f96d8fe674
Add CheckoutAcceptance factory 2023-05-03 14:21:13 -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
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
aa814cf761 Fixed #12946 - warranty lookup url was not nullable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-29 13:47:52 -07:00
snipe
7974c172fd Switch back to “normal” url for support 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:48:38 -07:00
snipe
54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe
5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622 
Dynamic warranty link for manufacturers' support urls
 2023-04-26 14:49:22 -07:00
akemidx
497d17835f requested edits 2023-04-26 17:06:08 -04:00
akemidx
aab53cf683 remove regex, add in starts_with 2023-04-26 15:18:13 -04:00
snipe
22d73f503a
Merge pull request #12756 from dboth/develop 
Fixed #8208, #8896, #8985 and #9789:  Currency issues when using non-english locales (resubmission)
 2023-04-25 22:32:13 -07:00
snipe
970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034 
Fixes sending webhook notifications for checkout and checkin
 2023-04-25 22:22:58 -07:00
snipe
d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe
c8c6f879d4
Merge pull request #12912 from Godmartinz/ldap_location_sync 
added ldap_location to settings
 2023-04-25 21:54:28 -07:00
snipe
27477085fe Merge branch 'develop' into features/auto_add_to_fieldset 2023-04-25 21:31:50 -07:00
snipe
07336bbc6a Added auto_add_to_fieldsets field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:51:36 -07:00