219 commits

Author	SHA1	Message	Date
snipe	3bb5479efd	Move print statement to LOG	2016-07-01 16:24:58 -07:00
snipe	483bf1b309	Merge branch 'v3' of github.com:snipe/snipe-it into v3	2016-06-28 12:19:19 -07:00
snipe	0e96a0aa3e	Updated comment	2016-06-28 12:19:14 -07:00
Daniel Meltzer	d484636bba	Add model number column to the hardware list. (#2204) ... * Add model number column to the hardware list and allow searching based on model number. Column is hidden by default. * Fix sorting. Add scope to order by model number.	2016-06-27 22:32:40 -07:00
Daniel Meltzer	5bc52a9425	Link to user on asset checkout as well as checkin.	2016-06-23 09:39:50 -04:00
snipe	4ed8ff5576	Formatting fixes for coding standards	2016-06-22 12:27:41 -07:00
snipe	2daed3c271	Fix for custom fields not saving	2016-06-10 16:36:46 -07:00
snipe	c1a3592059	Fixes #2130	2016-06-10 08:29:43 -07:00
Daniel Meltzer	f2a5337ad2	Simplify	2016-05-31 19:41:14 -05:00
Daniel Meltzer	0fa82743a1	Remove remaining DB::Raw(concat) calls to make things more sqlite friendly. This adds one new method to the Asset Model to return the formatted string that was used by the license and asset maintence controller. It also fixes a potential sqlite-only issue where '' and null are different.	2016-05-31 19:41:14 -05:00
snipe	abf027059f	Fixed comment	2016-05-24 16:06:15 -07:00
snipe	c1c7fa143d	Components display on assets page	2016-05-18 19:26:50 -07:00
snipe	ae8a03fec3	Add manufacturer name/sorting/searching on assets	2016-05-12 10:38:57 -07:00
snipe	97e218541b	Fixes date sanity check in checkout	2016-04-23 02:36:21 -07:00
snipe	8179fc2f90	Changed checkout method to be more generic, for checkin and checkout	2016-04-23 02:07:40 -07:00
snipe	c39e27cc5e	Fixes #1955 - searching within locations	2016-04-19 20:23:04 -07:00
snipe	a62859dc6d	Updated docblocks	2016-04-07 13:21:09 -07:00
snipe	6f9bad1005	Use lightbox for images in asset file listing	2016-03-25 20:38:27 -07:00
snipe	fe00b0e401	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00