dccd6fd4b1
Duplicate withCount
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 13:06:14 -08:00
7f8bdbd252
Added showableAssets() relationship to Category model
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 13:01:38 -08:00
1ebbc767f1
Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer
...
Added `vip` and `byod` to importer
2023-03-06 17:11:28 -08:00
e1069ac234
Return a file not found error if it doesn’t appear on disk
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:37 -08:00
8b6e8898c1
Fixed hardcoded string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:12 -08:00
2cb06165c4
Added missing vip field to transformer and request
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:00:04 -08:00
cc7325074e
Check that the file exists before trying to stat it for filesize
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 10:47:28 -08:00
463ef02fae
Merge pull request #12578 from inietov/fixes/undefined_variable_total
...
Fixed Undefined variable `$total`
2023-02-28 20:50:00 -08:00
1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable
2023-02-28 18:05:09 -08:00
1be0a8d911
Declare variable as an empty array
2023-02-28 10:22:49 -06:00
96c851468c
Added max results limit to report index
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-27 12:04:46 -08:00
5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report
...
Paginate accessories report
2023-02-23 12:26:17 -08:00
8e72da42e8
Merge pull request #12406 from akemidx/vip_tag
...
Added a checkbox to notate VIP status
2023-02-23 12:23:29 -08:00
eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies
...
Fix full company scoping in user selects
2023-02-23 10:36:33 -08:00
0c3115553e
Merge branch 'develop' into vip_tag
2023-02-21 20:03:49 -08:00
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
...
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
b0b1c96ab5
Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout
...
Fix asset names being removed during API checkout requests
2023-02-14 12:22:03 -08:00
8e00191b69
Add comment
2023-02-14 12:19:16 -08:00
a94f19a68e
Use name if provided by asset checkout request
2023-02-14 12:08:20 -08:00
2349f54013
Use translation strings for importer exceptions
2023-02-13 13:30:36 -08:00
73f355f3a8
Return 422 instead of 500 when import is invalid
2023-02-08 12:39:42 -08:00
b3881a43a7
Fix return type
2023-02-08 12:34:25 -08:00
c2c666aef0
Formatting
2023-02-08 12:32:57 -08:00
5962f1b627
Catch json encoding exceptions and display them to the user
2023-02-08 12:21:51 -08:00
3a86547ef5
fixes messages for integration test, removes slack request file, rehouses ajax method
2023-02-01 16:51:05 -08:00
d9cdb92014
Merge branch 'develop' into vip_tag
2023-02-01 16:03:23 -08:00
1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name
...
Fixed #12418 - added ability to edit custom field names via GUI
2023-02-01 13:39:39 -08:00
f95a904d90
adds integration button, working on its functionality
2023-02-01 12:08:13 -08:00
f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories
2023-01-31 19:56:43 -08:00
cddae4869f
fixed the endpoint for user notification with all their assigned assets
2023-01-31 18:27:25 +01:00
22b0b9b090
Fixed gates on fieldsets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-26 17:05:41 -08:00
4a54586690
Add to Accessories#index an additional gate-check against reports.view
2023-01-26 11:56:06 -08:00
53d8008a5f
Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag
2023-01-25 17:14:29 -05:00
b363524305
vipuser label updated to vip
2023-01-25 15:58:44 -05:00
4c3354b778
Merge branch 'develop' into vip_tag
2023-01-24 20:29:43 -08:00
596846a94a
Add VIP Checkbox
2023-01-24 15:29:27 -05:00
b92d1d3ec7
Logically group query when searching users to scope to company
2023-01-24 11:54:56 -08:00
d3bcc48ae5
[imports] fix "Backup before importing?" checkbox on import page
...
We were always taking backups before import, no matter the status of
this box.
Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.
We're now checking the status, and it behaves as expected
2023-01-23 15:08:59 -08:00
41537a2449
Added field to the API controller endpoints
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:56:44 -08:00
60eab08735
Added ->with(‘users as users_count’) in Accessory query
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-21 14:41:07 -08:00
378dc968b7
Derp. Copypasta
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-18 15:44:28 -08:00
0c39c7a53d
Updated blades to add byod as a “status”
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-18 13:25:46 -08:00
ee4b8f4694
Added byod to API controller
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-18 13:03:31 -08:00
dbda288a44
Formatting changes only for readability
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-17 17:21:20 -08:00
eaf9332096
Added filterability to 2FA fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-17 17:21:03 -08:00
151719a91c
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-10 16:24:46 -08:00
825df2cf75
Load up the item counts with the individual API methods for accurate numbers without n+1
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-10 16:17:03 -08:00
529b005d1e
We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 21:05:51 -08:00
7846251d25
Re-added return for no results (derp)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 20:43:57 -08:00
cc665d50ed
One more refactor, hopefully simplifying
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-09 20:40:12 -08:00