4049 commits

Author	SHA1	Message	Date
Zach Fox	d577b2e9e8	Actually add the API calls	2018-01-11 11:45:43 -08:00
luiscuenca	54a1da8d73	Only mod my card	2018-01-11 11:55:28 -07:00
Anthony Thibault	8d5e7dbeff	Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings ... Fix for black screen when clicking Settings from Snap app	2018-01-11 09:58:10 -08:00
John Conklin II	da2c56dbc9	Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings ... RC62: Fix for black screen when clicking Settings from Snap app	2018-01-11 09:48:03 -08:00
Seth Alves	363b9bfe11	Merge pull request #12127 from SamGondelman/freeze ... Comment out TabletAddressDialog logging of long messages	2018-01-10 18:07:18 -08:00
Seth Alves	457fcd6f40	Merge pull request #12129 from SamGondelman/doubleClick ... Move key logic from onClicked to onReleased	2018-01-10 18:03:23 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
MiladNazeri	c77d2f4e58	Merge pull request #12121 from cain-kilgore/21667 ... WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel	2018-01-10 17:11:54 -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
Anthony J. Thibault	1deb75daf7	Fix for black screen when clicking Settings from Snap app ... (cherry picked from commit d5e3b97c93)	2018-01-10 16:31:51 -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
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
Cain Kilgore	104ac0ffae	Indents, man	2018-01-10 20:30:41 +00: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
Cain Kilgore	057c708637	Spaces instead of Tabs ... (Damnit VS Re-install!)	2018-01-10 19:24:52 +00: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
SamGondelman	c46531296f	move key logic from onClicked to onReleased	2018-01-09 18:28:54 -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
Dante Ruiz	125eb9ce44	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -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
Cain Kilgore	4534419e53	Merge branch 'master' of https://github.com/highfidelity/hifi into 21667	2018-01-09 09:45:28 +00:00
Cain Kilgore	f78ee7c167	WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel	2018-01-09 09:44:12 +00: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
Anthony Thibault	1a97d1de0f	Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter ... Added exponential smoothing filter for vive pucks.	2018-01-05 16:50:55 -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
Ryan Downe Karpf	a3245aec57	Merge pull request #12079 from RebeccaStankus/log-filtering ... Log filtering	2018-01-05 08:40:41 -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
Anthony J. Thibault	eff77b995e	Merge branch 'master' into feature/exp-smoothing-input-filter	2018-01-04 15:24:33 -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
Anthony J. Thibault	9beb3ac5b6	Merge branch 'master' into feature/exp-smoothing-input-filter	2018-01-04 13:45:27 -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
RebeccaStankus	f52a6d8eae	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-04 10:49:32 -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
RebeccaStankus	9471dbeba9	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-03 11:39:38 -08:00
Zach Fox	6f077f3a92	Fix Security Pic Change dialog after QML security changes	2018-01-03 11:28:39 -08:00
Zach Fox	681b5173cd	Merge pull request #12082 from MiladNazeri/Fix-GitIgnore ... Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created	2018-01-03 09:34:14 -08:00
RebeccaStankus	9edb85efdc	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-03 09:25:38 -08:00
milad	63801ce802	add .jsc, remove duplicate qmlc, and remote Utils.jsc	2018-01-02 17:15:23 -08:00
Zach Fox	917db14879	Add a link to My Purchases from Wallet Home	2018-01-02 15:26:11 -08:00
RebeccaStankus	dd48972e44	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-02 14:06:41 -08:00
RebeccaStankus	bf59697aa5	better dropdown	2018-01-02 13:56:49 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -08:00
RebeccaStankus	fe69498976	initial changes...ready for feedback	2018-01-02 13:04:52 -08:00
vladest	a84e585679	Merge	2018-01-02 21:49:00 +01:00
RebeccaStankus	efdba3b6e6	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2018-01-02 08:59:42 -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
Elisa Lupin-Jimenez	01c1032540	fixed constant names, added another URL check	2017-12-27 10:51:58 -08:00
RebeccaStankus	296f0a323a	saving for Wednesday	2017-12-26 15:56:05 -08: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
RebeccaStankus	720f186bd7	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter	2017-12-22 13:47:42 -08:00
RebeccaStankus	1d4dedc1a1	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter	2017-12-22 07:52:31 -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
luiscuenca	38bfddf786	Added filter for QT autogenerated functions and integrated it to Developers menu	2017-12-21 16:26:06 -07: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
luiscuenca	54297e00a8	button size fix	2017-12-21 12:48:21 -07:00
luiscuenca	d93828f2f0	Fix an improve currentAPI.js	2017-12-21 11:50:02 -07: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
RebeccaStankus	95d94e1c8f	UI Done	2017-12-20 16:52:56 -08: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