14939 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	1659c3f1a6	Fixed inconsistent color type on checkin/checkout	2017-11-02 20:42:07 -07:00
snipe	caa8ec3178	Fixed checkout on license view page	2017-11-02 20:23:17 -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	0a5e4b9b7b	Fixed inconsistent required field indicator	2017-11-02 17:13:06 -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	513a1b1e3b	Bumped version	2017-11-02 12:52:44 -07:00
snipe	cf09908c60	Merge branch 'develop'	2017-11-02 12:50:56 -07:00
snipe	d21c92f91b	Changed assetloc to location	2017-11-02 12:50:34 -07:00
snipe	ffd93c59d6	Merge branch 'develop'	2017-11-02 11:26:13 -07:00
snipe	01bb4bf64a	Bumped version	2017-11-02 11:24:01 -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
snipe	e08911ab8f	Removed nonce for now ... There is a dependency in a package where we can’t edit the script tags to add the nonce	2017-11-02 10:57:05 -07:00
snipe	ca6dc5c2b5	Eager load user location	2017-11-02 10:56:36 -07:00
snipe	27875c2dac	Improved to use trans() facade instead of lang	2017-11-02 10:27:53 -07:00
snipe	6f886d3d6e	Merge branch 'develop'	2017-11-02 08:44:40 -07:00
snipe	fd74e4308b	Don’t show request if the user or the asset/model has been deleted	2017-11-02 08:11:04 -07:00
snipe	3695e118f4	Fixed erroneous call to assets.category in filter scope	2017-11-02 08:06:10 -07:00
snipe	f43692938b	Fixed slug call in asset models image	2017-11-02 08:02:51 -07:00
snipe	6008eec205	Merge branch 'develop'	2017-11-02 04:37:27 -07:00
snipe	3343cf16dd	Bumped version	2017-11-02 04:37:08 -07:00
snipe	48207fc695	Added model number in box header	2017-11-02 04:36:04 -07:00
snipe	3dae464c34	Added nicer formatting for model details	2017-11-02 04:33:53 -07:00
snipe	0c524e0830	Use model image if it’s a requestable model	2017-11-02 04:29:05 -07:00
snipe	da56a253bc	Added checkout requests method	2017-11-02 04:21:57 -07:00
snipe	a844d5b018	Added pagination, nicer formatting for requested assets	2017-11-02 04:17:14 -07:00
snipe	ba9bb470eb	Added imageSrc presenter to assets	2017-11-02 04:15:24 -07:00
snipe	41452450b3	Added imageSrc presenter	2017-11-02 04:15:09 -07:00
snipe	a9e5ad0df1	Added link to requested assets in sidenav	2017-11-02 03:12:12 -07:00
snipe	0e2f4f3cfb	Added requested route back in	2017-11-02 03:11:09 -07:00
snipe	3bc9d3f3f1	Merge branch 'develop'	2017-11-01 23:47:36 -07:00
snipe	81ca0ac91d	Added better styling for user upload	2017-11-01 23:46:21 -07:00
snipe	3ca5d39c66	Hide upload button if app is locked	2017-11-01 23:44:31 -07:00
snipe	4f008e118f	Fixed search string on suppliers selectlist	2017-11-01 21:55:17 -07:00
snipe	e11f9313f0	Fixed #4360 - better output if backup fails	2017-11-01 14:12:18 -07:00