2579 commits

Author	SHA1	Message	Date
vladest	9f32b6c634	Merge branch 'master' into webbrowser_updates	2017-10-25 21:46:39 +02: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
Dante Ruiz	f29937fb88	Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard	2017-10-24 13:54:21 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
vladest	874b9149e7	Popupd support reworked	2017-10-24 22:04:25 +02: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
Dante Ruiz	0242e8e4ba	fixed crash and login password	2017-10-23 16:33:49 -07:00
vladest	a33b2986cd	Merge branch 'master' into webbrowser_updates	2017-10-23 22:34:31 +02:00
vladest	fd41299efc	Disable profile and custom user agent which broke nav bars	2017-10-23 22:34:22 +02:00
Zach Fox	03b46c5e62	Merge pull request #11652 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer (Updated)	2017-10-23 12:22:21 -07:00
Zach Fox	30bffdea32	Quick bugfix	2017-10-23 11:45:51 -07:00
Cain Kilgore	b60b58ff35	zFox Changes	2017-10-23 19:40:43 +01:00
Cain Kilgore	3b4185fdb3	WL 21508 - Improve upon Skybox Changer ... This involved a second PR, due to optimizing the way the Skyboxes are laid out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.	2017-10-23 19:30:36 +01:00
Zach Fox	5c8451a626	Auto-refresh Wallet Home & Purchases on 4s timer	2017-10-23 10:36:23 -07:00
Melissa Brown	20787c9c7c	Merge pull request #11644 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer	2017-10-23 10:30:55 -07:00
Cain Kilgore	b42afdaff0	WL 21508 - Cleanup from Code Review	2017-10-23 16:27:28 +01:00
vladest	b791dcba7f	Add sound cues to create app	2017-10-22 14:59:53 +02:00
vladest	cf7b050680	Sound cues for GoTo interface	2017-10-21 20:47:56 +02:00
Cain Kilgore	bc772a2f9a	WL 21508 - Improve upon Skybox Changer	2017-10-21 19:42:53 +01:00
vladest	d46578e572	Merge branch 'master' into webbrowser_updates	2017-10-21 19:12:23 +02:00
Brad Hefta-Gaub	f6af1d1ecf	Merge pull request #11387 from vladest/tablet_extended_sounds ... Tablet extended sounds	2017-10-20 13:49:06 -07:00
vladest	908d601a43	Code style fixes #1	2017-10-20 20:00:11 +02:00
Seth Alves	9d00606505	Merge pull request #11635 from druiz17/fix-hud-issues ... actually fix toolbar from completely dispersing	2017-10-20 10:22:34 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
vladest	83c14bba5c	Fix popups misbehavior, wrong links with double http etc	2017-10-20 11:55:41 +02:00
druiz17	f2ad61934b	fix toolbar from completely dispearing	2017-10-19 14:02:21 -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
Brad Hefta-Gaub	f951a23356	Merge pull request #11627 from druiz17/reload-script ... fixed toolbar disapearing after reloading default scripts	2017-10-19 09:32:36 -07:00
vladest	92fc6daecc	Merge branch 'master' into webbrowser_updates	2017-10-19 14:56:31 +02: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
druiz17	36912f1cd4	fixed toolbar disapearing after reloading default scripts	2017-10-18 16:03:32 -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	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
John Conklin II	42a018c2c5	Merge pull request #11606 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords (RC-57)	2017-10-16 16:14: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
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
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
Zach Fox	95a9675220	Final help QA - minus link to blockchain docs	2017-10-13 10:58:15 -07:00
druiz17	2422c9d9f3	made requested changes	2017-10-13 10:45:24 -07:00