2163 commits

Author	SHA1	Message	Date
Howard Stearns	5fe7b874a4	Merge pull request #13455 from howard-stearns/test-wearables ... 16089: test wearables for wear before gifting and wearing	2018-06-25 16:44:53 -07:00
Zach Fox	3ceb9ddee9	Merge pull request #13444 from zfox23/MS16074_16076_banklinks ... Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity	2018-06-25 13:47:08 -07:00
howard-stearns	43cba68cd2	test wearables for wear before gifting and wearing	2018-06-25 13:40:45 -07:00
Zach Fox	6fce6431a3	Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home	2018-06-22 16:09:49 -07:00
Zach Fox	25f22326a8	Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity	2018-06-22 15:43:16 -07:00
Zach Fox	ad1da3e225	Fix MS16012: Correct the criteria used to determine empty txn history	2018-06-18 14:26:46 -07:00
howard-stearns	97fa22b69b	fix concurrency drillDown	2018-06-15 16:57:21 -07:00
John Conklin II	2655dd77b6	Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard ... MS15501: Fix keyboard in Create -> Model in HMD	2018-06-15 15:34:02 -07:00
Anthony Thibault	f2d6d0ee56	Merge pull request #13351 from ctrlaltdavid/21891 ... Fix Avatar > Attachments joint and spinboxes	2018-06-14 11:31:04 -07:00
John Conklin II	7057e00583	Merge pull request #13298 from danteruiz/fix-vive-configuration-page ... Controller Confguration Page fixes	2018-06-14 11:07:26 -07:00
Dante Ruiz	dc28e8f03f	fixing error	2018-06-13 18:24:06 -07:00
Dante Ruiz	eb01b50e6f	making code review changes	2018-06-13 17:58:10 -07:00
Zach Fox	6b59b5b53c	MS15501: Fix keyboard in Create -> Model in HMD	2018-06-13 13:23:43 -07:00
howard-stearns	05d3f92867	drillDownToPlace and iStacked based on server data.	2018-06-12 13:18:44 -07:00
Stephen Birarda	10e34000aa	Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains ... Domain-unreachable message remaining on slow connects	2018-06-11 10:46:55 -07:00
David Rowe	0161015746	Fix setting avatar attachment joint	2018-06-11 15:31:42 +12:00
howard-stearns	020d622302	don't depend on matching handlers with overlapping requests	2018-06-09 17:34:49 -07:00
howard-stearns	421edbfa1e	PSFListModel isa ListModel instead of hasa	2018-06-09 16:03:45 -07:00
howard-stearns	d68415c47c	code feedback	2018-06-08 16:47:06 -07:00
howard-stearns	f0d486a6a5	remove the unused client-side stuff from model	2018-06-08 15:48:39 -07:00
howard-stearns	d9daa3495a	remove comments / dead code	2018-06-08 15:36:10 -07:00
howard-stearns	36a0adf553	strip snapshot stacking code - we'll do it on server or not at all	2018-06-08 14:24:24 -07:00
howard-stearns	3ade31bdf6	always show edition	2018-06-08 12:57:40 -07:00
Zach Fox	9f0864944c	Fix Friending in Connections tab - READ FIXME	2018-06-08 11:37:02 -07:00
Dante Ruiz	5d570f030f	fixing calibration	2018-06-08 11:18:52 -07:00
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
Dante Ruiz	f5e2a6834b	fixing some issues	2018-06-04 16:09:31 -07:00
David Back	6b7d9586d1	apply fixes to other file dialogs and fix tablet dialog buttons	2018-06-04 15:56:10 -07:00
Dante Ruiz	48c0b7379a	fix vive configuration page	2018-06-04 15:16:11 -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
howard-stearns	29b09d64e6	checkpoint with PAL working.	2018-06-01 13:33:45 -07:00
Simon Walton	7d1d7f7bcd	Closing the open tablet dialog - try harder	2018-05-31 18:31:53 -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