snipe dc3af7cc74 Resolved conflicts ... Signed-off-by: snipe <snipe@snipe.net>		2021-10-04 20:39:24 -07:00
..
accessories	More help text updates	2018-10-04 21:14:45 -07:00
asset_maintenances	Added softwarew support and hardware support to maintenance types	2019-09-24 01:34:23 -07:00
categories	Resolved conflicts	2021-10-04 20:39:24 -07:00
companies	More help text updates	2018-10-04 21:14:45 -07:00
components	More help text updates	2018-10-04 21:14:45 -07:00
consumables	More help text updates	2018-10-04 21:14:45 -07:00
custom_fields	Updated languages	2018-05-21 14:54:36 -07:00
departments	Dept strings	2017-05-23 02:50:16 -07:00
depreciations	initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]	2021-08-10 18:26:43 -07:00
groups	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
hardware	Updated languages	2021-10-04 19:59:55 -07:00
kits	Small UI tweaks for kits	2020-09-15 10:15:14 -07:00
licenses	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
locations	Update table.php	2019-04-19 13:20:31 +03:00
manufacturers	Fixed #2402 - add ability to restore manufacturers	2018-03-03 18:46:19 -08:00
models	Updated languages	2021-10-04 19:59:55 -07:00
reports	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
settings	Resolved conflicts	2021-10-04 20:39:24 -07:00
statuslabels	Fixed #5138 - added default_label flag to status labels	2018-03-05 22:04:16 -08:00
suppliers	Disallow deleting suppliers with associated assets, licenses or maintenances	2017-10-18 05:47:20 -07:00
users	Resolved conflicts	2021-10-04 20:39:24 -07:00