1332 commits

Author	SHA1	Message	Date
snipe	14ca690441	Merge branch 'develop'	2017-11-04 01:11:41 -07:00
snipe	2de0a3669e	Check that there is a valid array before unshifting	2017-11-04 01:11:11 -07:00
snipe	69b90fb65e	Merge branch 'develop'	2017-11-04 00:46:22 -07:00
snipe	d68d95a915	Fixed - Added a “clear selection” option to select2 ajax lists	2017-11-04 00:19:16 -07:00
snipe	dc10f18188	Merge branch 'develop'	2017-11-03 21:53:13 -07:00
snipe	2522bfee9c	Only return mnon-archived assets by location	2017-11-03 21:46:11 -07:00
snipe	d7f8615964	Fixed query for location ID	2017-11-03 20:10:36 -07:00
snipe	ecd21074fb	Commented out erroneous fixme	2017-11-03 20:10:05 -07:00
snipe	12caa48390	Uncommented info output	2017-11-03 19:42:54 -07:00
snipe	cc7be5f947	Added location to checkout in API	2017-11-03 19:42:45 -07:00
snipe	5b489e003d	Set the location_id on save/update to rtd if one is given	2017-11-03 19:41:26 -07:00
snipe	8c1f4b006e	Removed comment	2017-11-03 19:40:55 -07:00
snipe	3a52c19428	Updated fieldname in Locations transformer and API	2017-11-03 19:40:40 -07:00
snipe	b786791401	Added location to checkout method	2017-11-03 19:39:48 -07:00
snipe	1c12b6e13b	Added artisan command to sync locations	2017-11-03 19:00:36 -07:00
snipe	c06539dee3	Update the location ID if there is an rtd_location given	2017-11-03 17:36:18 -07:00
snipe	3b9544d1f3	Remove commented code	2017-11-03 17:35:46 -07:00
snipe	da9bb07041	Add a default legacy cipher of rijndael-256	2017-11-03 16:27:03 -07:00
snipe	5d9b9ad590	Merge branch 'develop'	2017-11-03 15:05:07 -07:00
snipe	f95502ae35	Fixed search by model on adsvanced search for assets	2017-11-03 15:04:21 -07:00
snipe	877daba096	Merge branch 'develop'	2017-11-03 14:59:38 -07:00
snipe	b3b8ab493e	Switch to the reply_to address	2017-11-03 14:58:49 -07:00
snipe	87ba042b2d	Fixed manager name subquery on user search ... Self-joins in Laravel make baby jesus cry :(	2017-11-03 14:47:31 -07:00
snipe	6fb0ef908d	Fixed issue sorting when viewing users by department	2017-11-03 14:29:04 -07:00
snipe	c4a30cc646	Merge branch 'develop'	2017-11-03 13:29:33 -07:00
snipe	cf56f70b3a	Added table alias for sorting	2017-11-03 13:28:57 -07:00
snipe	f84e6a34cc	Merge branch 'develop'	2017-11-03 13:04:18 -07:00
snipe	85360a7c7f	Removed gates on selectlists ... They can’t access the API directly unless they have been granted API accesses anyway	2017-11-03 13:03:57 -07:00
snipe	9e0b3afa91	Merge branch 'develop'	2017-11-03 12:48:17 -07:00
snipe	416455fe01	Fixes weird manager_id validation ... This is a shit fix - need to find out what’s happening here.	2017-11-03 12:48:00 -07:00
snipe	3ecaa99990	Fixed only undeployed assets in checkout to list	2017-11-03 11:33:36 -07:00
Kasey	ab9729c39a	fix to availCount() (licenseSeatRelation) (#4378) ... `license_seats`.`user_id` represents an overall "owner" of the license	2017-11-03 09:51:15 -07:00
snipe	104cc2bf11	Make sure the seat hasn’t been deleted	2017-11-02 21:07:59 -07:00
snipe	0c794c103b	Return an integer value for free seats if null	2017-11-02 20:23:04 -07:00
snipe	53175d5035	Fixed sorting issue on company/manufacturer/supplier	2017-11-02 20:01:39 -07:00
snipe	0bd09f9c46	Added sorting on available and total seats	2017-11-02 19:37:30 -07:00
snipe	27d795508d	Fixed n+1 query, changed checkout behavior to just ask for a license ID ... We’re offloading the freeSeat() to the checkout page now	2017-11-02 19:16:09 -07:00
snipe	368ac5b85d	First stab at handling the n+1 issue on licenses	2017-11-02 18:20:42 -07:00
snipe	d5635f32e5	Merge branch 'develop'	2017-11-02 17:23:14 -07:00
snipe	f47075c180	Removed depreciation from Licenses transformer	2017-11-02 17:18:53 -07:00
snipe	85624205b4	Updated Lang::get to trans	2017-11-02 17:12:51 -07:00
snipe	2330e5ee57	Merge branch 'develop'	2017-11-02 16:20:48 -07:00
snipe	c9c5ce6ee0	Return Deleted User if the user is invalid for some reason	2017-11-02 16:20:01 -07:00
snipe	fc3a59d193	Merge branch 'develop'	2017-11-02 13:47:52 -07:00
snipe	950519be5d	Added a few more table aliases for ordering complex results	2017-11-02 13:47:37 -07:00
snipe	e64cf8b320	Merge branch 'develop'	2017-11-02 13:01:28 -07:00
snipe	87affa40ed	Fixes filtering on status label	2017-11-02 13:01:09 -07:00
snipe	ffd93c59d6	Merge branch 'develop'	2017-11-02 11:26:13 -07:00
snipe	28a4293a0b	Fixed #4370 - user’s listing flashing then no results	2017-11-02 11:19:34 -07:00
snipe	f095f1807c	Eager load userloc	2017-11-02 11:06:15 -07:00