1651 commits

Author	SHA1	Message	Date
Zach Fox	260aee42a8	Improvements	2018-01-10 16:18:34 -08:00
Anthony J. Thibault	d5e3b97c93	Fix for black screen when clicking Settings from Snap app	2018-01-10 16:03:53 -08:00
Zach Fox	c15b1669b1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 15:53:23 -08:00
Zach Fox	93b15c0aa6	Payment Failure	2018-01-10 15:53:13 -08:00
Zach Fox	6812010660	The skeleton is there	2018-01-10 15:33:18 -08:00
Zach Fox	22631065e4	Serious flow state	2018-01-10 15:09:15 -08:00
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
luiscuenca	e54f7d5a45	Fix Pal Master Volume overlap	2018-01-10 13:03:54 -07:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Howard Stearns	fafc98f51c	Merge pull request #12098 from ElderOrb/FB11123 ... FB11123 Make the certificate GOLD (and change title to Proof of Prove…	2018-01-10 10:01:15 -08:00
Zach Fox	f366fdf695	Beginnings of nearby	2018-01-10 09:58:23 -08:00
Zach Fox	928e3d2ef7	Merge pull request #12108 from zfox23/commerce_pagination ... Commerce: Support pagination at History endpoint; improve Purchases scrolling	2018-01-09 15:57:34 -08:00
Zach Fox	5469025113	More more more	2018-01-09 15:53:25 -08:00
Zach Fox	530df5447d	Even more proress	2018-01-09 15:19:50 -08:00
SamGondelman	a42b0cf485	comment out logging	2018-01-09 14:58:23 -08:00
Zach Fox	40a3f8b31b	Progress	2018-01-09 14:13:36 -08:00
Melissa Brown	19802b33eb	Merge pull request #12109 from vladest/tablet_page_indicator ... Page indicator visible only when pages more than one	2018-01-09 14:05:32 -08:00
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -08:00
Seth Alves	87dfe0efc3	Merge pull request #12097 from vladest/tablet_pagination_magnify ... Tablet pagination magnify	2018-01-09 08:08:02 -08:00
Alexander Ivash	0f6b93eaea	FB11123 Make the certificate GOLD (and change title to Proof of Provenance License)	2018-01-09 03:13:31 +03:00
vladest	891663bae9	Page indicator visible only when pages more than one	2018-01-08 23:07:09 +01:00
Zach Fox	611f25d542	Improve scrolling thru My Purchases	2018-01-08 13:17:04 -08:00
Zach Fox	dcfceab078	Remove all work done on paginating purchases	2018-01-08 12:03:56 -08:00
Zach Fox	2231bf2bdd	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination	2018-01-08 11:45:20 -08:00
Zach Fox	cdd62c7119	I don't think auto-refresh and pagination of inventory is possible	2018-01-08 11:29:41 -08:00
Zach Fox	99510f522d	Merge pull request #12095 from ElderOrb/FB10621 ... FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"	2018-01-08 10:05:53 -08:00
Howard Stearns	724db93389	Merge pull request #12002 from howard-stearns/consistent-goToUser ... Consistent go to user	2018-01-07 11:07:39 -08:00
vladest	02972c92f0	Merge branch 'master' into tablet_pagination_magnify	2018-01-05 19:12:13 +01:00
Seth Alves	2071d42d25	Merge pull request #12088 from ElderOrb/FB11008 ... 11008 GoTo app does not focus on address bar when opened	2018-01-05 10:07:36 -08:00
Andrew Meadows	c33c637f07	Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs ... Adopt path to certain Tablet dialogs to new loading subsystem and pat…	2018-01-05 09:07:54 -08:00
Seth Alves	fd8b521c50	Merge pull request #12038 from ElderOrb/audio_name_conflict_fix ... Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)	2018-01-05 08:15:48 -08:00
Alexander Ivash	437b78dce5	FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"	2018-01-05 13:35:19 +03:00
Zach Fox	4612ef3d7c	Use atYBeginning	2018-01-04 15:41:01 -08:00
vladest	67ca76baa1	Magninfication	2018-01-04 23:11:42 +01:00
Zach Fox	14447c26a0	Prevent visual data loss	2018-01-04 13:47:31 -08:00
Alexander Ivash	7ab7a46530	11008 GoTo app does not focus on address bar when opened	2018-01-04 23:38:10 +03:00
Zach Fox	10d494b51d	Pagination for Recent Activity	2018-01-04 12:32:30 -08:00
Ryan Downe Karpf	eada0b1ff7	Merge pull request #11546 from vladest/tablet_home_paginate ... Tablet home paginate	2018-01-03 18:12:32 -08:00
Zach Fox	6f077f3a92	Fix Security Pic Change dialog after QML security changes	2018-01-03 11:28:39 -08:00
Zach Fox	917db14879	Add a link to My Purchases from Wallet Home	2018-01-02 15:26:11 -08:00
vladest	afc3082593	Cleanup. Errors checks	2017-12-28 13:16:51 +01:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
vladest	ffcccacfa5	Selection consistency #2	2017-12-25 23:46:06 +01:00
vladest	cb7472c270	Selection consistency #1	2017-12-25 20:14:31 +01:00
vladest	9fa78bae0d	Merge branch 'master' into tablet_home_paginate	2017-12-23 17:46:51 +01:00
vladest	a497047666	Refactored using new GridView approach	2017-12-23 17:44:26 +01:00
Zach Fox	808b9cbc31	Merge pull request #12047 from zfox23/commerce_dataTracking3 ... Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-22 14:31:03 -08:00
Zach Fox	ef71470d85	Small change	2017-12-21 17:03:04 -08:00
Zach Fox	2acea75db3	Commerce: Checkout Layout Revisions	2017-12-21 16:09:46 -08:00
Zach Fox	618e5c9032	Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-21 15:46:01 -08:00
vladest	7985c39f2a	Adopt path to certain Tablet dialogs to new loading subsystem and path resolver	2017-12-21 22:14:15 +01:00
Alexander Ivash	bd3a056f4e	rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict ... note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope	2017-12-21 20:03:38 +00:00
vladest	2bca0939b3	Preliminary proxy model	2017-12-21 19:32:13 +01:00
vladest	d6e1a3ea41	Merge conflicts solved	2017-12-21 09:02:04 +01:00
vladest	79f9b54f6a	Store button list in the resources section of fake item instead of C++ space	2017-12-20 22:59:07 +01:00
Zach Fox	e02e6790fe	Fix error state for Commerce passphrase TextInputs	2017-12-20 13:46:02 -08:00
Zach Fox	08edc52932	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel ... Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-20 09:18:10 -08:00
Zach Fox	a72ed27a25	CR feedback	2017-12-19 16:57:48 -08:00
Zach Fox	5da49d156e	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
vladest	012f65a87f	Merge branch 'master' into tablet_home_paginate	2017-12-19 21:40:47 +01:00
howard-stearns	bb499000a6	trailing semicolon	2017-12-19 10:51:32 -08:00
howard-stearns	16a58ddf5a	Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser	2017-12-19 10:48:34 -08:00
Zach Fox	18d5be147c	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -08:00
Zach Fox	6fc58b713e	Merge pull request #12009 from zfox23/commerce_dataTracking2 ... Commerce: Add Passphrase Auth Status data tracking	2017-12-18 16:26:59 -08:00
Zach Fox	afd3cf7045	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-18 14:08:09 -08:00
Zach Fox	e075cd79fb	Add Passphrase Auth Status data tracking	2017-12-18 11:51:12 -08:00
vladest	38453afb3b	Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope	2017-12-18 14:56:33 +01:00
vladest	62a762b879	Merge branch 'master' into tablet_home_paginate	2017-12-16 20:32:21 +01:00
vladest	cdb9d72387	Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons	2017-12-16 20:27:19 +01:00
howard-stearns	d730b7b87b	consistent goToUser behavior in PAL, and be able to go to flying user.	2017-12-15 17:00:54 -08:00
Zach Fox	89795272c7	More security images!	2017-12-15 16:26:13 -08:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
Seth Alves	d3e24d3629	Merge pull request #11960 from ElderOrb/FB10334 ... 10334 Unable to type in Go To app search bar after UI reappears from …	2017-12-13 09:06:53 -08:00
vladest	99a6b12828	Merge branch 'master' into tablet_home_paginate	2017-12-13 16:02:29 +01:00
vladest	e052784431	Code style	2017-12-12 14:12:03 +01:00
Zach Fox	2225352b1e	Fix wallet setup	2017-12-11 17:15:15 -08:00
Howard Stearns	8e36228c12	Merge pull request #11948 from MandatoryMania/noFundsSymbol ... Provides a nice alert in case of insufficient funds to make a purchase	2017-12-11 11:45:27 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
vladest	e797f5cda0	Merge branch 'master' into tablet_home_paginate	2017-12-11 17:53:21 +01:00
vladest	cc78fc1f53	Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections	2017-12-11 17:50:16 +01:00
Alexander Ivash	cb471582e5	10334 Unable to type in Go To app search bar after UI reappears from moving Avatar	2017-12-10 01:34:03 +03:00
humbletim	abba85ac54	add missing colonsemi	2017-12-08 18:14:30 -05:00
humbletim	34243f4239	disable connections console.log to prevent UI lag	2017-12-08 17:10:57 -05:00
vladest	3aaf666295	Merge branch 'master' into tablet_home_paginate	2017-12-08 19:59:41 +01:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Seth Alves	eda63e5758	Merge pull request #11919 from ElderOrb/FB9706 ... 9706 Editing Attachments Results In Attachments Window Scrolling To Top	2017-12-08 07:01:00 -08:00
H Q	4ce784291c	Provides a nice alert in case of insufficient funds to make a purchase	2017-12-07 15:13:01 -08:00
vladest	9b3db0725b	Retreive buttons list from tablet proxy	2017-12-07 22:36:34 +01:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
vladest	c9f86e4b6b	Merge branch 'master' into tablet_home_paginate	2017-12-07 19:16:13 +01:00
vladest	3c11d29a7f	Something intermediate	2017-12-07 19:13:39 +01:00
Brad Hefta-Gaub	88ed15aaaa	Merge pull request #11942 from ctrlaltdavid/21633 ... Fix image overlay's subImage property's width and height support	2017-12-07 09:19:43 -08:00
David Rowe	efd72be96f	Fix image overlay's subImage property's width and height support	2017-12-07 12:05:46 +13:00
Zach Fox	3183a1a8b9	Add setupAttemptID to every step (thanks Dave)	2017-12-05 16:48:30 -08:00
Zach Fox	902064ed37	Cleanup debug stuff	2017-12-05 15:26:55 -08:00
Zach Fox	c807fc80e3	Add marketplace cta referrer	2017-12-05 15:25:05 -08:00
Zach Fox	7521e4870e	Bugfixes	2017-12-05 14:56:47 -08:00
Zach Fox	668f6d50b5	Add data tracking for wallet setup	2017-12-05 14:13:48 -08:00
Zach Fox	4334bf8222	Add data tracking for purchase and rez	2017-12-05 13:09:09 -08:00
Zach Fox	c80039ea87	Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1 ... Fix gray/incorrect security image after relog	2017-12-05 11:21:06 -08:00