2513 commits

Author	SHA1	Message	Date
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
Brad Hefta-Gaub	c4e672d6b8	Merge pull request #11582 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords	2017-10-16 14:57:18 -07:00
Brad Hefta-Gaub	60030c08fa	Merge pull request #11573 from druiz17/bug-hud-module ... hud module intersects with dev stats window	2017-10-13 11:48:06 -07:00
druiz17	2422c9d9f3	made requested changes	2017-10-13 10:45:24 -07:00
druiz17	83d2a54b0f	fixed some bugs	2017-10-12 13:48:21 -07:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
Zach Fox	30d6c78e4e	Merge pull request #11580 from ElderOrb/case8210 ... 8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 11:49:18 -07:00
Zach Fox	1227168939	Merge pull request #11575 from ElderOrb/QTBUG-49297 ... workaround for https://bugreports.qt.io/browse/QTBUG-49297	2017-10-12 10:56:45 -07:00
druiz17	a6bc6a09a5	Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module	2017-10-12 10:34:17 -07:00
beholder	f31316b0aa	8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 15:03:32 +03:00
beholder	dcdf85b08e	workaround for https://bugreports.qt.io/browse/QTBUG-49297	2017-10-12 02:10:09 +03:00
druiz17	42cab19ab2	generialze window search	2017-10-11 16:04:35 -07:00
druiz17	8f3fa08b1e	hud module intersects with stats window	2017-10-11 11:41:10 -07:00
Zach Fox	99109fe8e5	Merge pull request #11567 from zfox23/commerce_daveIntegration3 ... 2017-10-10 Commerce Frontend Updates	2017-10-11 11:07:03 -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
Dante Ruiz	742cf0debe	Merge pull request #11383 from ElderOrb/case7384 ... 7384 On Domains without Edit Access, Create Button Text still Highlights	2017-10-10 14:30:49 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Zach Fox	702528a8cc	Fully integrate cert properties	2017-10-10 13:27:17 -07:00
Zach Fox	1c0a564155	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3	2017-10-10 12:36:06 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -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
Cain Kilgore	583b0c521e	Open	2017-10-10 03:40:48 +01:00
Cain Kilgore	e9f4dee56d	WL 21562 - Fix the error in the Asset Browser	2017-10-10 03:39:13 +01: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
druiz17	cd97ab0fdf	fixed looping sample sound bug	2017-10-09 11:39:57 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Zach Fox	051b63503c	Merge pull request #11534 from zfox23/commerce_daveIntegration1 ... Commerce backend changes sync, October 5 2017	2017-10-06 09:45:45 -07:00
David Rowe	28c7ef2e97	Merge branch 'master' into vr-edit-a	2017-10-06 11:54:08 +13: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
Andrew Meadows	05f2dfbbc3	Merge pull request #11529 from vladest/fix_audiotab_name_alignment ... Fix alignment of audio devices input header	2017-10-05 13:50:29 -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
Ryan Huffman	f0c9badbd6	Fix misspelling in lost-connection-to-atp error	2017-10-05 09:10:46 -07:00
vladest	193dc83b99	Fix alignment of audio devices input header	2017-10-05 13:59:42 +02:00
Zach Fox	9d51d40af4	Merge pull request #11489 from vladest/login_dialog_rework ... Login dialog rework	2017-10-04 15:47:44 -07:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
vladest	86e8076362	Fix puntuation mode	2017-10-04 20:30:25 +02:00
vladest	0a505617df	Implemented single keyboard instance for all Tablet login dialog items	2017-10-04 19:33:36 +02:00
Zach Fox	fcafbef109	Fix buying free items using Commerce system	2017-10-04 09:34:32 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
vladest	6fddf49988	Merge branch 'master' into login_dialog_rework	2017-10-03 21:39:38 +02:00