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
|
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 |
|
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 |
|
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
|
78d8e32a22
|
Fixed weird order number thing
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-22 21:16:24 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
snipe
|
7ae260b489
|
More license translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-01 19:51:06 +01:00 |
|
snipe
|
5e96fd200f
|
Refactor to remove general_fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 20:31:53 -07:00 |
|
snipe
|
3e4426c68c
|
Clearer comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 19:20:52 -07:00 |
|
snipe
|
d4c5a4eb2e
|
More aliases
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 13:18:32 -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
|
d0f5a044ba
|
More refactoring
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 12:13:06 -07:00 |
|
Ivan Nieto Vivanco
|
086265455d
|
Pass user count to the eloquent query
|
2023-05-23 11:53:09 -06: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 |
|
ak-piracha
|
457f4c410a
|
add check for default consumable qty
|
2023-05-21 23:11:03 +09:30 |
|
ak-piracha
|
bb013d5c3c
|
Bulk Consumable Checkout
|
2023-05-21 22:49:00 +09:30 |
|
snipe
|
511d83cc47
|
Added/fixed a few more translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:52:42 -07:00 |
|
snipe
|
1396e314c4
|
Updated arrays with translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:21:13 -07:00 |
|