|
|
3cb0920411
|
Merge branch 'develop' into company-scoping
|
2023-06-26 12:32:10 -07:00 |
|
|
|
f646623a5e
|
Merge branch 'develop' into bulk_edit_custom_fields
|
2023-06-22 18:00:31 -05:00 |
|
|
|
8df9db76bc
|
column ordering fix
|
2023-06-22 17:12:40 -04:00 |
|
|
|
8725d40f8d
|
current value added to asset index page. translations for this in reports
|
2023-06-22 17:00:42 -04:00 |
|
|
|
78d8e32a22
|
Fixed weird order number thing
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-22 21:16:24 +01:00 |
|
|
|
8aae5beaba
|
Add explicit select back to query
|
2023-06-22 13:09:08 -07:00 |
|
|
|
a8133f62e8
|
Add explicit select back to query
|
2023-06-22 13:07:49 -07:00 |
|
|
|
ab5fed09db
|
Remove scopeCompanyables call from AssetsController@requestable
|
2023-06-22 12:36:43 -07:00 |
|
|
|
0a5e1e3190
|
Remove scopeCompanyables call from AssetsController@selectlist
|
2023-06-21 17:21:36 -07:00 |
|
|
|
fd55c99b87
|
Remove scopeCompanyables call from AssetsController@index
|
2023-06-21 16:29:44 -07:00 |
|
|
|
5d4e704fac
|
Added a comment
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-21 09:26:54 +01:00 |
|
|
|
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 |
|
|
|
ee50906e44
|
attempt to add warranty to api controller
|
2023-06-13 11:20:55 -07:00 |
|
|
|
8e6e525b47
|
Remove scopeCompanyables call from LicensesController
|
2023-06-07 16:09:45 -07:00 |
|
|
|
a18f5e7fc0
|
Remove scopeCompanyables call from ConsumablesController
|
2023-06-07 14:22:22 -07:00 |
|
|
|
48850f3597
|
Remove scopeCompanyables call from ComponentsController
|
2023-06-06 18:02:18 -07:00 |
|
|
|
086265455d
|
Pass user count to the eloquent query
|
2023-05-23 11:53:09 -06:00 |
|
|
|
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 |
|
|
|
a6eeae6541
|
Eager load fieldset default values in asset model endpoint
|
2023-05-22 14:19:03 -07:00 |
|
|
|
457f4c410a
|
add check for default consumable qty
|
2023-05-21 23:11:03 +09:30 |
|
|
|
bb013d5c3c
|
Bulk Consumable Checkout
|
2023-05-21 22:49:00 +09:30 |
|
|
|
71234228b4
|
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to
removes assigned_to if archived
|
2023-05-16 17:25:24 -07:00 |
|
|
|
02cacf76c6
|
Additional multi-select options for custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 13:58:21 -07:00 |
|
|
|
8e3cbdad90
|
removes assigned_to if archived
|
2023-05-15 11:52:57 -07:00 |
|
|
|
0f3b77ee2d
|
Added multi-select option to custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 14:45:31 -07:00 |
|
|
|
5e34ffa2b0
|
wip
|
2023-05-10 14:08:12 -05:00 |
|
|
|
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 |
|
|
|
7c77f4a697
|
Extra debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 09:10:53 -07:00 |
|
|
|
537aa04c9a
|
Merge branch 'develop' into delete_asset_from_view_page
|
2023-05-10 09:30:54 -04:00 |
|
|
|
788c03ef57
|
Hide client secret if app is locked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:22:49 -07:00 |
|
|
|
2dd32d8785
|
Re-add the image update
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:27 -07:00 |
|
|
|
ff66a938c1
|
Clearer comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:15 -07:00 |
|
|
|
7f0e677908
|
Use normal translation style
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:05 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
567a800c51
|
Added debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:47:52 -07:00 |
|
|
|
e5eb5932ca
|
Create constructor to override expected config variables
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:37:03 -07:00 |
|
|
|
3612526632
|
Disallow saving data if app is locked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:14:54 -07:00 |
|
|
|
aefd330e4e
|
Added methods for google settings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:54:28 -07:00 |
|
|
|
b7e8ce3064
|
Changed redirect
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:54:14 -07:00 |
|
|
|
c52b48c383
|
Google oauth login
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:14:28 -07:00 |
|
|
|
1d2596fc54
|
wip
|
2023-05-09 14:58:59 -05:00 |
|
|
|
332b017dcc
|
Pass filename for manual backups
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 15:00:02 -07:00 |
|
|
|
5960a5425d
|
Pass filename to pre-import backup
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 14:48:26 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8b73fa0053
|
Added missing use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-06 06:36:09 -07:00 |
|
|
|
fbb7c55450
|
Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models
|
2023-05-04 03:12:36 -06:00 |
|
|
|
96c6d8896f
|
Add additional information to acceptance notifications for assets, accessories, and consumables
|
2023-05-03 17:04:01 -07:00 |
|
|
|
4a0b3efd1f
|
Include user's name in Acceptance result notifications for accessories
|
2023-05-03 14:22:05 -07:00 |
|
