5256 commits

Author	SHA1	Message	Date
Zach Fox	ed84b49ece	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
Zach Fox	55a0f77697	Notifications for MARKET	2018-09-18 14:45:14 -07:00
Zach Fox	23fab0985b	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-17 11:11:21 -07:00
Zach Fox	9c5544af39	Merge in big work from appui_notifications branch	2018-09-14 14:37:04 -07:00
Zach Fox	9e50904376	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-14 14:36:22 -07:00
Dante Ruiz	ff52639bc3	fix update	2018-09-14 14:10:36 -07:00
Dante Ruiz	4eb5c9714b	fix snapshot settings	2018-09-14 12:59:28 -07:00
Wayne Chen	bf7dd94db7	button was clipped; adding higher res img	2018-09-13 17:25:33 -07:00
Wayne Chen	2b8aebdb6b	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to aef3ed3e01.	2018-09-13 17:21:29 -07:00
Wayne Chen	40451a1fc1	Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" ... This reverts commit c5468fd8e9.	2018-09-13 17:21:07 -07:00
Wayne Chen	c5468fd8e9	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to 77d5ebf34f.	2018-09-13 17:18:49 -07:00
Wayne Chen	b4b0c519f3	Merge branch 'master' into fixGoToButtonInterstitial	2018-09-13 17:11:34 -07:00
Wayne Chen	db1acb87b8	button was clipped; adding higher res img	2018-09-13 15:38:24 -07:00
Wayne Chen	bcd014ddc8	Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor	2018-09-13 10:29:02 -07:00
Wayne Chen	5902699870	adding updated models for redirect	2018-09-12 22:54:23 -07:00
Wayne Chen	fc007982e0	muting opt out activity if login fail/success	2018-09-12 21:25:41 -07:00
Wayne Chen	be650d5af0	changing when to log - there is broken code in bodyLoader	2018-09-12 16:00:43 -07:00
Zach Fox	de2548d926	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-12 09:30:00 -07:00
John Conklin II	f67deb9f65	Merge pull request #13938 from wayne-chen/interstitalMerged ... Interstitial Page with 404 Redirect	2018-09-12 08:39:52 -07:00
Wayne Chen	cb0aa8055f	Merge pull request #13961 from wayne-chen/loginOnLaunch ... Pop up login dialog on launch	2018-09-11 17:43:29 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
Seth Alves	3b3006efb0	Merge pull request #13911 from ElderOrb/FB17982_master ... Avatar App: stop reloading existing selected bookmarks on app relaunch (master)	2018-09-11 14:04:19 -07:00
Zach Fox	ea04ee6d35	Wallet now uses AppUi	2018-09-11 12:37:53 -07:00
Wayne Chen	d69e536120	Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch	2018-09-11 12:18:36 -07:00
Wayne Chen	ee516fd79f	adding proper checking for saved username/login	2018-09-11 09:36:46 -07:00
Brad Hefta-Gaub	299e9d0d38	Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints ... filter out left/right hands from joints list in avatarapp	2018-09-11 09:34:48 -07:00
Wayne Chen	6bcf6eaae7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch	2018-09-11 09:13:41 -07:00
Wayne Chen	565bf7f6bd	adding correct implementation of show password	2018-09-11 09:08:35 -07:00
Wayne Chen	030ee13f31	removing logging from tabletlogindialog	2018-09-10 23:05:31 -07:00
Wayne Chen	69ae475787	adding user activity logging	2018-09-10 23:04:50 -07:00
Wayne Chen	5ece8d8707	using different paradigm for checking login dialog popup	2018-09-10 18:32:21 -07:00
Wayne Chen	e7616c7d34	added logging + activity logging	2018-09-10 15:06:14 -07:00
Anthony Thibault	4754ff7f54	Merge pull request #13963 from hyperlogic/feature/improve-jump-anims ... Improve animations for jump, inAir and less feminine walk cycle	2018-09-10 13:57:33 -07:00
John Conklin II	9c546fc780	Merge pull request #13957 from ElderOrb/FB18024 ... fix keyboard collapsing in VR/goto	2018-09-10 13:09:28 -07:00
Wayne Chen	a8adaff6c1	Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch	2018-09-10 11:36:53 -07:00
Wayne Chen	ff86e480ba	adding debug statement to check for window close	2018-09-10 11:36:45 -07:00
Seth Alves	cb33222fea	Merge pull request #13886 from ctrlaltdavid/M17901 ... Improve HMD Menu page navigation	2018-09-10 11:34:21 -07:00
Anthony Thibault	d9beadb7e4	remove tabs from avatar-animation.json	2018-09-10 10:49:43 -07:00
Wayne Chen	e721844b10	Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch	2018-09-10 10:10:16 -07:00
Anthony Thibault	ff645be78b	Update animations for jump, inAir and less feminine walk cycle	2018-09-07 17:09:55 -07:00
John Conklin II	472675f9a8	Merge pull request #13956 from hyperlogic/feature/improve-anim-stats ... Move animation stats into its own Menu	2018-09-07 14:51:46 -07:00
Wayne Chen	695f6a8f16	Merging changes, modifying close button	2018-09-07 12:05:28 -07:00
Wayne Chen	39041f2942	fixing username field	2018-09-07 11:36:21 -07:00
Wayne Chen	44d36ec622	wallet should save username when checked	2018-09-07 11:31:36 -07:00
Wayne Chen	db96603cda	removing some unused properties	2018-09-07 11:23:58 -07:00
Wayne Chen	d9495275cc	adding cancel button and signed in checkbox	2018-09-07 11:22:31 -07:00
Wayne Chen	e1541fd7e0	Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch	2018-09-07 08:43:42 -07:00
Alexander Ivash	7058b07aea	FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized	2018-09-07 12:41:39 +03:00
Alexia Mandeville	190a335c71	Adding more margin to forgotten links	2018-09-07 00:01:00 -07:00
Alexia Mandeville	92f218ae29	Adding margins to forgotten link text	2018-09-06 22:59:19 -07:00