22845 commits

Author	SHA1	Message	Date
Olivier Prat	1ce1aca79f	Merged with samcake's 'black' branch	2017-12-07 08:59:38 +01:00
John Conklin II	fffcf56904	Merge pull request #11892 from SamGondelman/snapshot ... Expose Window.getDeviceSize()	2017-12-06 16:44:08 -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
Clément Brisset	a5e671e0fd	Merge pull request #11931 from highfidelity/stable ... stable -> master	2017-12-05 11:58:23 -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
NissimHadar	ec1c4c37fa	Merge pull request #11912 from ElderOrb/FB9461 ... 9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-04 16:49:25 -06: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
Brad Hefta-Gaub	33adb0d76d	Merge pull request #11868 from ctrlaltdavid/21615 ... Add "size" as synonym for "dimensions" in model overlay property setter	2017-12-03 18:10:30 -08:00
Brad Hefta-Gaub	06cf194ec7	Merge pull request #11910 from ctrlaltdavid/21626 ... Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-03 18:09:17 -08:00
Brad Hefta-Gaub	314265fa86	Merge pull request #11891 from ctrlaltdavid/21625 ... Add missing line3d overlay property getters and setters	2017-12-02 12:52:44 -08:00
Brad Hefta-Gaub	3f705a7baf	Merge pull request #11858 from vladest/fix_tablet_scrollbars ... Use ScrollBars from QQC2, which supports mouse and touch events	2017-12-02 12:51:14 -08:00
Brad Hefta-Gaub	ec33aa9c4b	Merge pull request #11880 from ElderOrb/FB7991 ... 7991 Change Instances of Edit Mode to Create Mode	2017-12-02 12:50:48 -08:00
Anthony Thibault	fe16cc3fab	Merge pull request #11902 from luiscuenca/onloadFix ... Fixes create list and web and QML audio sync	2017-12-01 16:05:07 -08: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	b8f7ba9aa6	Fix month display in commerce...	2017-12-01 10:45:36 -08:00
Alexander Ivash	48b50e33dd	9461 Keyboard for create appear then disappears immediately (HMD)	2017-12-01 20:29:35 +03:00
Zach Fox	ebb2e50d01	Fix month display in commerce...	2017-12-01 09:29:19 -08:00
David Rowe	fd76c7a88b	Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-01 17:40:34 +13: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	b0dda3de33	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh	2017-11-30 10:49:20 -08:00
vladest	a3d406d8d1	Merge branch 'master' into fix_tablet_scrollbars	2017-11-30 11:40:50 +01:00
vladest	dfeefe53b8	Make scroll bar handle centered on shaft. Width chaned on par with entities list html view	2017-11-30 11:40:02 +01:00
luiscuenca	b890a29b3a	Clean console log	2017-11-29 19:05:01 -07:00
luiscuenca	b817143e2e	Fixes on web and QML audio sync	2017-11-29 18:16:21 -07:00
Zach Fox	39afb4ab6a	Merge pull request #11882 from howard-stearns/the-lost-ECDSA ... The lost ecdsa	2017-11-29 15:53:52 -08:00
howard-stearns	55589312f1	new padding/initialization that matters on linux server	2017-11-29 09:53:48 -08:00
Zach Fox	3c892920e3	Prevent seeding text from flashing	2017-11-28 17:00:15 -08:00
howard-stearns	281b4cfd88	Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA	2017-11-28 16:59:44 -08:00
SamGondelman	c5ebb8a279	expose Window.getDeviceSize()	2017-11-28 16:16:30 -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
David Rowe	b9ad15b19e	Add missing line3d overlay property getters	2017-11-29 11:03:16 +13:00
David Rowe	3956b3b953	Fix missing line3d overlay property setter overrides of base class	2017-11-29 10:41:51 +13:00
David Rowe	76c934f012	Add missing line3d overlay property setters	2017-11-29 10:41:21 +13:00
vladest	7283f0127b	return back square background for scroll bars	2017-11-28 22:21:52 +01:00
vladest	94937374c5	Make selection not visible under rounded scrollbar	2017-11-28 21:33:13 +01:00
vladest	b2ec2aab15	Merge branch 'master' into fix_tablet_scrollbars	2017-11-28 20:41:07 +01:00