1202 commits

Author	SHA1	Message	Date
snipe	6633366b29	Small fix for status label types	2016-06-28 12:40:20 -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
snipe	e4275bd3d3	Fixes status label inline creation	2016-06-28 12:19:05 -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	0cf563ae5b	Show admin in maintenances	2016-06-22 17:04:47 -07:00
snipe	0ca85f8a8a	Updates to components	2016-06-22 14:55:17 -07:00
snipe	f753783ca0	Smaller miminums for model and category name	2016-06-22 12:50:21 -07:00
snipe	4ed8ff5576	Formatting fixes for coding standards	2016-06-22 12:27:41 -07:00
Daniel Meltzer	5a45ec708b	Use the model validation trait to validate asset maintences. Might be better to add a form request as well, but this at least makes the model validation occur. fixes #2170	2016-06-16 22:22:07 -04:00
snipe	6a277a5391	Added inheritance back into users/groups	2016-06-15 20:45:45 -07:00
snipe	c29984d0df	Skip superuser check if the user isn't logged in	2016-06-13 19:05:29 -07:00
snipe	bfe4bc6ee5	Bypass company scoping if user is an admin	2016-06-13 11:40:22 -07:00
snipe	396446a34b	Updated namespace for collection	2016-06-13 10:54:28 -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
snipe	a0901247a3	Let superadmins through companyable trait	2016-06-10 04:07:27 -07:00
snipe	ec4bc6c2af	Allow superadmins to print labels	2016-06-10 03:40:49 -07:00
snipe	95f94c1cfb	Fixed error when user has no permissions values	2016-06-02 17:16:22 -07:00
snipe	97691726f0	Updates to permissions decoding	2016-06-02 02:49:32 -07:00
snipe	eacf70ee3f	Updated validation	2016-06-01 15:45:05 -07:00
Daniel Meltzer	1c1ef951e9	Fix a regression in Helper::usersList and ::managerList() where the "Select a User" option disappeared. Also format names the way they used to be formatted.	2016-06-01 13:47:46 -05: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
Daniel Meltzer	4b98711e07	Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly	2016-05-31 19:41:14 -05:00
snipe	0e0b31bba6	Company name length to 1	2016-05-31 15:04:13 -07:00
snipe	bfc3f69adb	Better comments on model methods	2016-05-24 16:08:18 -07:00
snipe	cde0d49e18	Added assets method	2016-05-24 16:06:22 -07:00
snipe	abf027059f	Fixed comment	2016-05-24 16:06:15 -07:00
snipe	c4a699f109	Validation for new alert settings	2016-05-19 19:43:05 -07:00
snipe	c1c7fa143d	Components display on assets page	2016-05-18 19:26:50 -07:00
snipe	fb26188e41	Fixed dashboard for components	2016-05-18 19:16:43 -07:00
snipe	23e416fd88	Make site name required	2016-05-18 18:24:28 -07:00
snipe	0568e979e8	If permissions are blank, don't error out on json_decode	2016-05-18 14:38:17 -07:00
snipe	e552c36a0a	Add model_no, item_no, and manufacturer to consumables	2016-05-16 17:11:31 -07:00
snipe	415b60a293	Added check for setup in Setting model	2016-05-14 16:09:00 -07:00
snipe	8ca71df7c9	Check for superuser	2016-05-14 15:05:35 -07:00
snipe	a726934cde	Fixed bulk delete+checkin for users	2016-05-12 21:01:31 -07:00
snipe	ae8a03fec3	Add manufacturer name/sorting/searching on assets	2016-05-12 10:38:57 -07:00
snipe	d40289fbc9	Fixes #1997 and #1996 - replace sentry functions	2016-04-28 21:59:43 -07:00
snipe	a0bff94de3	Moved selectedPermissionsArray	2016-04-28 20:57:07 -07:00
snipe	449163c875	Fixes #1995 - updated group admin to use native permissions	2016-04-28 14:03:54 -07:00
snipe	96911b9e57	Fixes #1944 - add manufacturer to model list	2016-04-23 03:34:49 -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	13f85e82bb	Fixes #1909 - allow 0 month depreciation	2016-04-19 07:39:54 -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	95e2825716	A few more path fixes	2016-03-25 17:20:28 -07:00
snipe	fe00b0e401	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00