3290 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	e11f9313f0	Fixed #4360 - better output if backup fails	2017-11-01 14:12:18 -07:00
snipe	d379c6b61f	Merge branch 'develop'	2017-11-01 13:28:19 -07:00
snipe	d36e8cfbd2	Dashbpoard pie fixes	2017-11-01 13:27:59 -07:00
snipe	4cdcbc97ee	Fixed varname issue on old image delete for manufacturers	2017-11-01 13:10:56 -07:00
snipe	ba516ac9af	Merge branch 'develop'	2017-11-01 11:11:32 -07:00
snipe	feb2f5b076	Fixed #4356 - removed reference to old assetloc	2017-10-31 18:20:03 -07:00
snipe	b5f1e10b45	Merge branch 'develop'	2017-10-31 11:50:47 -07:00
snipe	a1eac967a7	Few more migration fixes	2017-10-31 08:57:57 -07:00
snipe	6186c324b5	Misc assetLoc error checks	2017-10-31 08:47:40 -07:00
snipe	772785f9b5	Few more fixes for big ugly location migration	2017-10-31 08:39:53 -07:00
snipe	2f6c0cee59	Merge branch 'develop'	2017-10-31 07:46:36 -07:00
snipe	e56f1ee6fd	Fix for anomolies where asigned_type is not null but asigned_to is	2017-10-31 07:33:43 -07:00
snipe	37868cd70e	Added warranty and expiration to list view	2017-10-31 07:05:15 -07:00
snipe	32b2f77ad9	Fixed issue where we tried to call the audit log even if the asset wasn’t valid	2017-10-31 05:41:06 -07:00
snipe	472a5b9f69	Removed extra log on API asset create	2017-10-31 05:38:52 -07:00
snipe	121e158f39	Change method name from userloc to location ... This needs to be changed in more places though	2017-10-31 05:22:57 -07:00
snipe	f4e7bfc28d	Null custom field if field exists but is empty	2017-10-31 05:22:21 -07:00
snipe	0089f73686	Moved trait to single line	2017-10-31 05:21:55 -07:00
snipe	0f4c05c5d0	Remove commented code	2017-10-31 05:02:46 -07:00
snipe	379274deff	Check for multiple variable (for bulk checkout)	2017-10-31 04:48:40 -07:00
snipe	dbf5fec7b0	Fixed language string	2017-10-31 04:48:09 -07:00
snipe	4bb546a882	Pull assigned asets preview into its own blade for re-use	2017-10-31 04:47:59 -07:00
snipe	7f1b7be416	Rolling back prepending models to sort	2017-10-30 21:26:25 -07:00
snipe	02720f225c	Fixed sorting issue in asset models when ordering by manufacturer	2017-10-30 20:51:01 -07:00
snipe	e44e573a3c	Fixed requestable assets reference to assetloc	2017-10-30 19:40:35 -07:00
snipe	546c3e50fa	Fixed updating the assigned assets location if user’s location changes	2017-10-30 19:33:52 -07:00
snipe	7f1b962e56	Improved use of de-normed locations fields	2017-10-30 19:21:35 -07:00
snipe	4eee7f8d97	Added address for users - fixes #4323	2017-10-30 18:57:00 -07:00
snipe	0fd0e3a8b4	Returns null for order number if it’s blank	2017-10-28 15:53:22 -07:00
snipe	1076ec96be	Bumped version	2017-10-28 15:46:02 -07:00
snipe	3b498efee1	Fixes indefined item in user select blade	2017-10-28 15:42:55 -07:00
snipe	9687a78981	Fixed a few inconsistencies in the API results (null vs empty string)	2017-10-28 15:17:36 -07:00
snipe	2244a4b3cf	Fix peresenter for assigned	2017-10-28 15:17:09 -07:00
snipe	f3f84f1a8c	Production assets	2017-10-28 11:22:38 -07:00
snipe	41994c95e0	Bumped version	2017-10-28 11:22:27 -07:00
snipe	39c68214e9	More ajax menu fixes	2017-10-28 11:17:52 -07:00
snipe	9c94e70917	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-10-28 09:21:49 -07:00
snipe	6a3716a06d	Added new ajax dropdown menus for components, consumables, etc editing/creating	2017-10-28 09:21:39 -07:00
Sorvani	feccc55c54	Added support for Fedora to the installer. (#4332)	2017-10-28 09:17:19 -07:00
snipe	fe70792cbd	Bumped hash	2017-10-28 08:41:34 -07:00
snipe	95b6e0d2d8	Fixed assetloc to location	2017-10-28 08:40:27 -07:00
snipe	5d890fb139	Added more defaults for selected values	2017-10-28 08:38:19 -07:00
snipe	cd2816b1c7	Suppliers ajax menu API route	2017-10-28 08:38:00 -07:00
snipe	2172e6cc25	Added suppliers ajax list	2017-10-28 08:37:47 -07:00
snipe	04130a568c	Fixes check for help_text	2017-10-28 07:41:13 -07:00
snipe	108ac79442	Added update to asset location id on checkout/checkin	2017-10-28 07:38:36 -07:00
snipe	3d7fd5cf04	Fixed references to assetLoc in hardware view	2017-10-28 07:29:32 -07:00
snipe	5737de2e22	Added help text to location partial	2017-10-28 07:29:14 -07:00
snipe	1e21cef218	Set max page size to 500	2017-10-28 07:29:03 -07:00
snipe	ad7a2da9bd	Add help text that explains location override	2017-10-28 07:28:49 -07:00