581 commits

Author	SHA1	Message	Date
Zach Fox	432e647f7a	Fix 'What's This' link	2018-02-23 15:08:33 -08:00
howard-stearns	3c2626894c	fixes	2018-02-23 14:54:03 -08:00
howard-stearns	050df2ac2a	merge	2018-02-23 14:46:13 -08:00
Zach Fox	9b54ab1080	UI changes, V1	2018-02-23 14:42:05 -08:00
howard-stearns	09091d29f7	more logic framework	2018-02-23 14:35:30 -08:00
howard-stearns	84f9bff330	basic element, but not pretty and not functioning	2018-02-23 13:56:56 -08:00
Alexander Ivash	f9de255fa7	FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials	2018-02-23 20:07:09 +03:00
Zach Fox	249f0568a1	New loader	2018-02-22 17:14:23 -08:00
howard-stearns	1aaae94cc1	checkpoint	2018-02-22 17:04:27 -08:00
Zach Fox	f14673bc50	Fixup Checkout for apps	2018-02-22 16:38:38 -08:00
Zach Fox	33f73fef0d	YAY!	2018-02-22 16:26:35 -08:00
Zach Fox	10fa3fa346	It's working!	2018-02-22 16:09:01 -08:00
Atlante45	7bad82818b	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-02-22 14:45:41 -08:00
Zach Fox	de0eee52d6	cool	2018-02-22 14:45:32 -08:00
Zach Fox	4d2d7fa51f	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
Zach Fox	3d4e6de6ab	Quick bugfix	2018-02-22 10:49:11 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
Zach Fox	74655bde49	Fix skeletonmodelURLchanged signal	2018-02-21 12:12:20 -08:00
Zach Fox	b548567f5a	Apps protection	2018-02-21 11:17:47 -08:00
Zach Fox	1fbc16aae2	Fix noPermissionGlyph margin	2018-02-21 10:52:17 -08:00
Zach Fox	f08c66e3ac	Remove debug code	2018-02-20 14:16:55 -08:00
Zach Fox	fd6f4b569f	Fix active focus issue	2018-02-20 13:19:31 -08:00
Zach Fox	eb29bdf5d2	Don't allow tabs or newlines	2018-02-20 13:06:10 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Zach Fox	9bde9f5a4f	Fix height of Optional Message in Send Money	2018-02-20 12:36:11 -08:00
Zach Fox	11f897beb0	Initial app support	2018-02-20 10:39:36 -08:00
Zach Fox	c4e9c76258	Small UIT tweaks	2018-02-15 16:03:49 -08:00
Zach Fox	811ecf9db8	Fix	2018-02-15 14:44:33 -08:00
Zach Fox	8072372822	Lots of changes	2018-02-15 13:27:13 -08:00
Zach Fox	b8fb08dc74	Avatar support	2018-02-15 11:24:22 -08:00
Zach Fox	5a8b8d4ac8	Lots of changes	2018-02-14 16:44:02 -08:00
Alexander Ivash	611c67bf2f	FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard	2018-02-15 02:00:51 +03:00
vladest	d71448d217	Merge branch 'master' into move_to_qqc2	2018-02-14 20:47:37 +01:00
Zach Fox	0fca843667	Integrate 'alreadyOwned' endpoint	2018-02-14 10:24:34 -08:00
Zach Fox	a477a3da70	Done with My Purchases flow for now	2018-02-13 15:04:31 -08:00
Zach Fox	3e41229e8c	Commerce: Fix wrap mode for very long P2P memos	2018-02-13 13:30:17 -08:00
vladest	e8959b4cc0	Merge branch 'master' into move_to_qqc2	2018-02-13 22:01:16 +01:00
Zach Fox	0809210dc3	No permission card	2018-02-13 11:16:48 -08:00
Zach Fox	95e9eb8e4a	Lots of progress	2018-02-12 17:06:57 -08:00
Zach Fox	ffea8104fc	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-09 15:59:38 -08:00
Zach Fox	abdd50fb45	it's a start	2018-02-09 15:56:28 -08:00
Zach Fox	ecc0a2f43b	Bugfix.	2018-02-08 10:41:22 -08:00
Zach Fox	679d53e2cf	This works, but is it correct?	2018-02-08 10:41:10 -08:00
Zach Fox	3a7e626463	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-08 10:41:04 -08:00
Zach Fox	a92e614aff	Bugfix.	2018-02-08 10:35:34 -08:00
Zach Fox	e01e88d4ae	This works, but is it correct?	2018-02-07 15:13:22 -08:00
Zach Fox	2270dcd79d	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-07 13:52:20 -08:00
Zach Fox	3c34d13ec6	Revert "Commerce: Inspection Certificate Redesign"	2018-02-07 13:22:09 -08:00
Zach Fox	a40244b5d2	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-07 10:19:30 -08:00
Zach Fox	2a0d85a119	Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle ... Commerce: Send Money Nearby particle effect!	2018-02-02 14:17:48 -08:00
Zach Fox	f26477b3e1	Slight wording change to Optional Message placeholder	2018-02-02 11:00:32 -08:00
Zach Fox	19235b8d94	Fix a bug where hover events incorrectly propagate under popups	2018-02-02 10:50:35 -08:00
Zach Fox	dd2b7eb107	Send Money Effect & Lightbox	2018-02-01 15:17:50 -08:00
Zach Fox	fa69ea0352	Small comment addition	2018-02-01 13:57:05 -08:00
Zach Fox	ce79504f03	Fix checkbox	2018-02-01 11:51:08 -08:00
Zach Fox	bd26c9dfc0	More improvements	2018-02-01 09:36:41 -08:00
Zach Fox	14051bce0c	This logic is insane	2018-01-31 17:20:20 -08:00
Zach Fox	fb5308e517	This logic is insane	2018-01-31 17:06:29 -08:00
Zach Fox	ab3a91a1da	Oooooh it's so pretty	2018-01-31 16:53:23 -08:00
vladest	1c63bcf02e	Merge branch 'master' into move_to_qqc2	2018-01-31 22:13:52 +01:00
Zach Fox	90c2371f0c	It's working!	2018-01-31 12:09:23 -08:00
Zach Fox	05fe33e417	Initial work	2018-01-30 18:01:46 -08:00
Zach Fox	d13d0e6ba2	Minor fixes	2018-01-30 14:30:50 -08:00
Zach Fox	b60a45d358	Inspection Certificate Redesign	2018-01-29 15:14:29 -08:00
Zach Fox	afc71a5ac5	Fix Purchases sorting (again); Fix (i) icon loading	2018-01-25 12:17:34 -08:00
Zach Fox	94e1c425ab	Fix MacOS Security Pic visibility; fix incorrect button state when changing pic	2018-01-24 17:03:16 -08:00
Zach Fox	6f54921cb1	Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear ... Fix security image index clear after back nav	2018-01-24 13:43:49 -08:00
Zach Fox	1920bedaf3	Fix the text filter in My Purchases	2018-01-23 13:42:38 -08:00
Zach Fox	86ce9766f3	Fix security image index clear after back nav	2018-01-23 10:11:23 -08:00
vladest	b947504849	Merge conflicts	2018-01-22 21:42:32 +01:00
John Conklin II	8b461b960f	Merge pull request #12223 from zfox23/commerce_sendMoney2 ... Commerce: Pixel-perfect "Send Money" UI	2018-01-22 09:39:23 -08:00
Zach Fox	1dde640a40	-_-	2018-01-19 16:06:01 -08:00
Zach Fox	89e403d438	Balance text in send money	2018-01-19 15:39:57 -08:00
Zach Fox	4d408a8df5	Nearby UI	2018-01-19 14:49:28 -08:00
vladest	c235deb6f0	Merge branch 'master' into move_to_qqc2	2018-01-19 23:01:04 +01:00
Zach Fox	495c4f56e2	Only small tweaks remaining?	2018-01-18 17:51:08 -08:00
Zach Fox	6b5389a167	go go go go go	2018-01-18 17:37:26 -08:00
Zach Fox	c6429f4f33	Path towards pixel perfection	2018-01-18 17:05:36 -08:00
David Kelly	844ec6a863	eliminate dash in history, replace with 0 HFC	2018-01-18 16:02:40 -08:00
Zach Fox	8cc427a374	Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1	2018-01-16 15:07:53 -08:00
Zach Fox	8cc5a0a7cb	Add UserInfoViewer	2018-01-16 15:06:51 -08:00
David Kelly	a9fc63da4c	fix error when pending	2018-01-16 15:04:05 -08:00
Zach Fox	d64b35729f	Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1	2018-01-16 13:44:29 -08:00
vladest	b3b7a7636f	Merge branch 'master' into move_to_qqc2	2018-01-16 21:08:49 +01:00
David Kelly	d8f8f9ff1a	First cut at alan's new design	2018-01-16 11:19:10 -08:00
Zach Fox	6b90ceaeb4	Quick bugfix and code change for clarity	2018-01-16 10:40:51 -08:00
Zach Fox	f7ed8c10fa	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-15 10:13:07 -08:00
David Kelly	579a4d85b3	Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory	2018-01-12 14:37:46 -07:00
Zach Fox	c216144015	Remove unnecessary comments	2018-01-11 16:21:59 -08:00
Zach Fox	464bbe5d43	Bugfixes, refactoring, and improvements	2018-01-11 15:26:51 -08:00
Zach Fox	1e608b13b2	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
Zach Fox	df58065e75	Silly bug	2018-01-11 13:02:00 -08:00
Zach Fox	d25ef074e1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-11 12:35:18 -08:00
howard-stearns	c39771d995	do not delete wallet file when things go wrong, and remove obsolete ... reset machinery	2018-01-11 11:50:23 -08:00
Zach Fox	d577b2e9e8	Actually add the API calls	2018-01-11 11:45:43 -08:00
Zach Fox	939012a2d0	Hook up the endpoints!	2018-01-10 17:10:05 -08:00
Zach Fox	0d137d62c8	HMD tweaks	2018-01-10 16:37:47 -08:00
Zach Fox	b3e3af4ee7	Add character count :)	2018-01-10 16:23:29 -08:00
Zach Fox	260aee42a8	Improvements	2018-01-10 16:18:34 -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
vladest	04d45be0a9	Merge branch 'master' into move_to_qqc2	2018-01-10 21:21:03 +01: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	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
Zach Fox	40a3f8b31b	Progress	2018-01-09 14:13:36 -08:00
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -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
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
vladest	00b1d4b0ea	Merge branch 'master' into move_to_qqc2	2018-01-05 23:40:36 +01: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
Zach Fox	14447c26a0	Prevent visual data loss	2018-01-04 13:47:31 -08:00
Zach Fox	10d494b51d	Pagination for Recent Activity	2018-01-04 12:32:30 -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	2fbd0a41b1	Move Slider	2017-12-28 15:39:22 +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
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
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
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
vladest	2770650b65	Merge branch 'master' into move_to_qqc2	2017-12-12 18:48:41 +01:00
Zach Fox	2225352b1e	Fix wallet setup	2017-12-11 17:15:15 -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
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08: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
Zach Fox	1507620fd5	Merge pull request #11921 from ElderOrb/FB10024 ... 10024 Wallet: TextField Focus Problems	2017-12-05 10:52:08 -08:00
Zach Fox	d59c9bd73a	Fix gray/incorrect security image after relog	2017-12-05 10:27:40 -08:00
Alexander Ivash	f7328f05fb	remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface	2017-12-05 00:51:42 +03:00
Zach Fox	4c96fc2d9d	Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation ... Call reset() on Wallet before creating new wallet	2017-12-04 13:05:36 -08:00
Alexander Ivash	8a5904373b	remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button	2017-12-05 00:04:46 +03:00
Alexander Ivash	c67ff3b5d8	10024 Wallet: TextField Focus Problems ... note: removed excessive MouseArea-s	2017-12-05 00:03:48 +03:00
vladest	f2d7e2f607	Merge branch 'master' into move_to_qqc2	2017-12-02 22:41:19 +01:00
Howard Stearns	e2efe062fe	Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh ... Don't refresh Inventory or Recent Activity if data hasn't changed	2017-12-01 13:57:34 -08:00
Zach Fox	ebb2e50d01	Fix month display in commerce...	2017-12-01 09:29:19 -08:00
Zach Fox	24e5994f20	The nuclear option is a bad option.	2017-11-30 15:55:09 -08:00
Zach Fox	009d3a18a3	Call reset() on Ledger and Wallet before creating new wallet	2017-11-30 15:40:20 -08:00
Zach Fox	3c892920e3	Prevent seeding text from flashing	2017-11-28 17:00:15 -08:00
Zach Fox	5dc8715879	Bugfix	2017-11-28 16:14:17 -08:00
Zach Fox	489d11d5fd	Remove logging	2017-11-28 16:01:58 -08:00
Zach Fox	3e5a2addd2	Use same logic for Recent Activity	2017-11-28 16:00:46 -08:00
Zach Fox	e769d2fbc3	Don't refresh Inventory or Recent Activity if data hasn't changed	2017-11-28 15:44:42 -08:00
vladest	3f0de940a4	Merge branch 'master' into move_to_qqc2	2017-11-26 10:18:44 +01:00
Zach Fox	fada02a76c	Merge pull request #11864 from zfox23/commerce_newHelpText ... New Help questions/answers/link	2017-11-22 12:53:16 -05:00
Zach Fox	d2ebfbf064	New Help questions/answers/link	2017-11-21 18:55:48 -05:00
vladest	c8d864465f	Merge branch 'master' into move_to_qqc2	2017-11-18 18:54:08 +01:00
vladest	34fe517c67	Merge conflicts	2017-11-18 18:48:33 +01:00
Zach Fox	d31578abae	FIXME LATER! Remove mouseareas from passphrase screens	2017-11-17 15:47:02 -08:00
Zach Fox	7d34b3fe67	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-17 15:45:03 -08:00
Zach Fox	ec16f16757	Remove debug buttons from wallet	2017-11-17 15:21:18 -08:00
Zach Fox	f570e3c874	Fix 'My Items' display	2017-11-17 11:27:00 -08:00
Zach Fox	7f64ede940	Fix skipping wallet setup step in certain cases	2017-11-16 11:44:52 -08:00
vladest	2aae8edde0	Merge branch 'master' into move_to_qqc2	2017-11-16 19:08:15 +01:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
vladest	0e53afc346	Merge branch 'master' into move_to_qqc2	2017-11-15 20:53:14 +01:00
Zach Fox	e8c4878c8f	Fix rezzing non-JSON marketplace items	2017-11-15 11:25:18 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Zach Fox	5290ee3b4e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-14 10:07:44 -08:00
Zach Fox	a3332e15b7	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-13 15:01:26 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
Zach Fox	38fde43009	...simplify your life	2017-11-08 13:19:47 -08:00
Zach Fox	3190fe1f32	Use keyfilepath instead of cached public keys	2017-11-08 12:30:48 -08:00
Zach Fox	72fa0823ba	Logic changes	2017-11-08 11:01:54 -08:00
Zach Fox	b7163bb8fc	Frontend changes	2017-11-08 10:25:11 -08:00
Zach Fox	f248eb5518	Change wallet home when 0 transactions	2017-11-07 11:30:09 -08:00
Zach Fox	149c8fbeb2	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-06 09:25:30 -08:00
Zach Fox	6f3c61c4e0	Slightly modify invalid cert language	2017-11-02 17:59:36 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Zach Fox	56cb98d96f	Make inspection cert work	2017-11-01 12:02:57 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
Zach Fox	9481824d0a	Fix enabled status of wear button	2017-10-26 17:02:09 -07:00
Zach Fox	5898f0bd0c	Gotta do some fancy stuff with anchors for this to work	2017-10-25 15:04:47 -07:00
Zach Fox	dafa830c0d	First steps	2017-10-25 14:44:59 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 ... 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Zach Fox	30bffdea32	Quick bugfix	2017-10-23 11:45:51 -07:00
Zach Fox	5c8451a626	Auto-refresh Wallet Home & Purchases on 4s timer	2017-10-23 10:36:23 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
Zach Fox	dc1b3aef8f	Don't show purchases tutorial if user clicks what is rez	2017-10-18 16:25:06 -07:00
Zach Fox	322bac035c	Don't show 'no permission' text on wearables	2017-10-18 16:19:54 -07:00
Zach Fox	1b7b35fe91	What does Rez mean?	2017-10-18 15:44:06 -07:00
Zach Fox	91ac2ab58c	LowerKeyboard button changes	2017-10-18 15:31:12 -07:00
Zach Fox	a993386613	Change color of 'Instructions Opened on Desktop' to disabled gray	2017-10-18 15:13:28 -07:00
Zach Fox	33508b6b2b	Update help text	2017-10-18 14:55:45 -07:00
Zach Fox	e829bd2919	Fix 'Recent Activity' indentation	2017-10-18 14:47:14 -07:00
Zach Fox	6f5fafb62f	Add 'showDebugButtons' switch on Help ta	2017-10-18 14:12:43 -07:00
Zach Fox	876001146a	Get categories from backend instead of site	2017-10-18 14:05:47 -07:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
Zach Fox	6b7c997a4c	Minor text tweak	2017-10-13 13:37:11 -07:00
Zach Fox	051019a57a	Fix certificate username text eliding too early	2017-10-13 12:10:37 -07:00
Zach Fox	95a9675220	Final help QA - minus link to blockchain docs	2017-10-13 10:58:15 -07:00
Zach Fox	3f0ec73be6	Fix date displays	2017-10-11 10:55:14 -07:00
Zach Fox	5e383e2b1c	My Item certificates	2017-10-10 14:56:17 -07:00
Zach Fox	702528a8cc	Fully integrate cert properties	2017-10-10 13:27:17 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Zach Fox	b81a8a95ea	Final fixes	2017-10-09 15:23:22 -07:00
Zach Fox	38b95b5403	Instructions HTML file and flow	2017-10-09 15:07:14 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Zach Fox	acdd1e32e4	First round	2017-10-09 12:11:07 -07:00
Zach Fox	0b600a74c3	Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout	2017-10-05 14:34:53 -07:00
Zach Fox	9290a51685	Fix confirmed text	2017-10-05 14:03:56 -07:00
Zach Fox	8e82095135	Number sold and limited run	2017-10-05 12:46:20 -07:00
Zach Fox	d605bd9ef4	Preprocess inventory endpoint result	2017-10-05 11:01:15 -07:00
Zach Fox	fcafbef109	Fix buying free items using Commerce system	2017-10-04 09:34:32 -07:00
Zach Fox	e64b0861a1	Change passphrase working	2017-10-03 10:53:10 -07:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
Zach Fox	1d1b846f39	Better 'view backup instructions' behavior	2017-10-02 12:44:51 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
vladest	9a00468ea9	semicolons, yes	2017-10-01 19:21:30 +02:00
vladest	feafd441b1	Make sure keyboard will be rised after lowering on another click	2017-10-01 18:54:07 +02:00
Zach Fox	e6ea76eefe	Tiny language fix - Thanks Cain!	2017-09-29 15:44:44 -07:00
Zach Fox	4668294389	Fix login flow regression	2017-09-29 15:25:24 -07:00
Zach Fox	bbbce96407	Fix gray securityimage	2017-09-29 14:30:02 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
vladest	7f6773b1f4	Added semicolons	2017-09-29 21:12:21 +02:00
vladest	01a0b26b90	Remove mouse area for text fields. use activeFocusOnPress property instead	2017-09-29 17:14:35 +02:00
Zach Fox	a1ae13489e	Slight changes to tutorial	2017-09-28 16:41:29 -07:00
Zach Fox	2cff5c1fa6	First time Purchases tutorial	2017-09-28 15:12:55 -07:00