3611 commits

Author	SHA1	Message	Date
howard-stearns	21ed081eae	proper name for updated type filter of inventory endpoint	2018-06-08 09:52:11 -07:00
howard-stearns	64e466ee7d	snapshot stacks	2018-06-07 21:10:40 -07:00
howard-stearns	595a0d8733	restore lost code	2018-06-07 19:24:05 -07:00
howard-stearns	348d5fc359	inventory text filter	2018-06-07 17:01:48 -07:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
howard-stearns	8b08505116	using filter/sort endpoint parameters	2018-06-07 16:14:18 -07:00
Zach Fox	f9b6e3e2ac	Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks ... Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable	2018-06-07 15:10:00 -07:00
howard-stearns	890c97e7cb	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 12:24:27 -07:00
David Back	ae5d056ca0	Merge pull request #13292 from dback2/fileChooser ... File Dialog Fixes	2018-06-07 09:38:56 -07:00
howard-stearns	8185d1b5f5	cleanup and consistently don't getNextPage at beginning	2018-06-06 15:24:54 -07:00
howard-stearns	335aeaeb38	purchases cleanup, wearables, and edition numbers when multiples seen.	2018-06-05 17:06:08 -07:00
howard-stearns	6aa551b35c	Don't getNextPage when at beginning (even if that is also the end).	2018-06-05 17:04:29 -07:00
howard-stearns	ce41b83bad	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-05 15:30:04 -07:00
Zach Fox	2932ce177d	Fix MS15500: Ensure Connection usernames show up in PAL	2018-06-05 10:57:25 -07:00
howard-stearns	f72f8c762b	goto client-side filtering (preliminary)	2018-06-04 16:52:20 -07:00
Zach Fox	c5ef5cfccb	Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable	2018-06-04 16:13:18 -07:00
David Back	6b7d9586d1	apply fixes to other file dialogs and fix tablet dialog buttons	2018-06-04 15:56:10 -07:00
howard-stearns	5a1b56d573	checkpoint with goto feeds working (but without filtering)	2018-06-04 13:11:06 -07:00
howard-stearns	e40fc20cb6	fix some bugs that had been introduced by various out-of-team prs.	2018-06-04 13:00:08 -07:00
David Back	074892591d	fix auto-selecting subdir and not showing Choose when no row selected	2018-06-04 11:13:03 -07:00
howard-stearns	29b09d64e6	checkpoint with PAL working.	2018-06-01 13:33:45 -07:00
howard-stearns	e8e12eef8f	checkpoint	2018-05-31 14:42:52 -07:00
howard-stearns	b0d3729d4d	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-30 17:09:57 -07:00
howard-stearns	bdd38cef7a	checkpoint	2018-05-30 17:09:13 -07:00
Wayne Chen	81eea5d8d1	Merge pull request #13213 from wayne-chen/filebrowser-case-14515 ... Adding showHidden properties to file dialogs to allow for showing hidden files/folders	2018-05-30 10:43:58 -07:00
howard-stearns	a84829392f	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-29 16:14:22 -07:00
howard-stearns	17be460adf	checkpoint	2018-05-25 16:37:06 -07:00
howard-stearns	d30d84f1bd	checkpoint that has two ways to do filtering	2018-05-25 15:30:27 -07:00
John Conklin II	eeed3ae82d	Merge pull request #13211 from druiz17/login-fix ... Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"	2018-05-25 11:33:29 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Wayne Chen	345138f4ff	Changing showHidden property to be always true	2018-05-23 10:30:08 -07:00
Wayne Chen	e3414c320e	changing property to alias to reflect folderListModel	2018-05-22 11:03:31 -07:00
Wayne Chen	1774b401c8	allowing file dialogs to show hidden files/folders via showHidden property	2018-05-22 10:24:04 -07:00
Alexander Ivash	d659696b60	FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links	2018-05-21 13:29:41 -07:00
howard-stearns	d385a255c4	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-18 16:53:08 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Dante Ruiz	60dd7e49ab	making requested changes	2018-05-18 16:41:39 -07:00
Brad Davis	ae07036f20	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
vladest	95cd9476c3	Fixed modality in Desktop	2018-05-17 16:11:28 +02:00
Dante Ruiz	2a6204ca8d	remove option for mouse sensivtity	2018-05-16 15:47:55 -07:00
Zach Fox	bc590f556a	Get first page	2018-05-16 14:43:43 -07:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
Zach Fox	97bb014734	Almost working for Purchases!	2018-05-16 13:20:23 -07:00
Zach Fox	0021af8714	Merge in in-progress changes from old commerce_paginationAndFiltering branch	2018-05-16 12:28:52 -07:00
Zach Fox	154d70866f	It's working	2018-05-16 12:17:17 -07:00
Zach Fox	79f8232c14	Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel	2018-05-16 11:11:24 -07:00
Dante Ruiz	37c51a7246	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
vladest	72838f6d34	Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons	2018-05-16 17:06:31 +02:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00