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

2573 commits

Author SHA1 Message Date
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
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
Brady Wetherington
76191a09ed Improvements to asset_tag auto-incrementing, with auto-fixups for gaps 2023-07-12 16:39:45 +01: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
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
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
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
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
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
Godfrey M
ee50906e44 attempt to add warranty to api controller 2023-06-13 11:20:55 -07: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
Marcus Moore
48850f3597
Remove scopeCompanyables call from ComponentsController 2023-06-06 18:02:18 -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
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
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
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
788c03ef57 Hide client secret if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:22:49 -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