3846 commits

Author	SHA1	Message	Date
John Conklin II	00a8b73814	Merge pull request #13751 from danteruiz/fix-flying ... fix flying	2018-08-03 19:27:47 -07:00
Dante Ruiz	9bebd1e623	making changes	2018-08-03 18:11:55 -07:00
Sam Gateau	c1951da2bb	Merge pull request #13737 from jherico/fix/fb16633_a ... Don't allow Web surfaces created by non-client scripts to access files	2018-08-03 15:25:41 -07:00
Zach Fox	67528cb646	Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present	2018-08-01 15:49:53 -07:00
Brad Davis	4b317a84d8	Don't allow Web surfaces created by non-client scripts to access files	2018-08-01 15:12:45 -07:00
Zach Fox	7905c91289	Merge pull request #13727 from zfox23/MS17168_filterWhenViewing ... Fix MS17168: Filter My Purchases when clicking View link on Confirmation	2018-08-01 14:23:26 -07:00
John Conklin II	c444bb11ba	Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit ... Avatarapp: base 'SquareLabel' on button from Uit	2018-08-01 13:10:33 -07:00
John Conklin II	082a3bca89	Merge pull request #13679 from ElderOrb/FB16840 ... FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…	2018-08-01 11:46:59 -07:00
John Conklin II	bda9ed7f1a	Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix ... use 'light' color scheme	2018-08-01 11:23:10 -07:00
Zach Fox	4b41804326	Fix MS17168: Filter My Purchases when clicking View link on Confirmation	2018-07-31 14:52:01 -07:00
Alexander Ivash	6e6eae2160	Avatarapp: base 'SquareLabel' on button from Uit	2018-07-31 22:03:34 +03:00
John Conklin II	09d1964f1d	Merge pull request #13670 from ElderOrb/animate_get_more_avatars ... Avatarapp: hover animation for 'get more avatars' button	2018-07-31 09:51:58 -07:00
John Conklin II	221dd3ee88	Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes ... FB16992 - Layout changes to the two lightboxes in the Avatar app	2018-07-31 09:36:16 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 ... FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
John Conklin II	200292c18e	Merge pull request #13675 from howard-stearns/forget-you ... pal refresh fixes	2018-07-30 14:38:24 -07:00
John Conklin II	9c37e30fe6	Merge pull request #13678 from ElderOrb/FB17023 ... FB17023 - Make visible avatar url in the avatar app	2018-07-27 14:57:25 -07:00
Alexander Ivash	29f7cab7df	FB16702 - Avatar App does not save Animation JSON Override URL ... note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'	2018-07-27 02:08:44 +03:00
howard-stearns	9b61e8c4ad	Merge branch 'master' of github.com:highfidelity/hifi into forget-you	2018-07-26 11:50:15 -07:00
Zach Fox	eea4630d2b	Fix MS16704: Remove worn Avatar/Wearable before updating	2018-07-24 14:29:05 -07:00
Alexander Ivash	c9d9f7363a	use 'light' color scheme	2018-07-24 23:19:11 +03:00
Alexander Ivash	dfb20c4afc	FB16840 - Qml spinboxes in UI toolkit should focus the underlying field when clicked on	2018-07-24 23:02:06 +03:00
Alexander Ivash	c13f27e2eb	FB17023 - Make visible avatar url in the avatar app	2018-07-24 22:10:18 +03:00
howard-stearns	48184c102b	Merge branch 'master' of github.com:highfidelity/hifi into forget-you	2018-07-23 15:25:46 -07:00
howard-stearns	f87db26cad	pal refresh that remembers your place	2018-07-23 15:25:06 -07:00
John Conklin II	27b35d84cc	Merge pull request #13652 from r3tk0n/16206-flying-settings ... MS16206 - Enable flight by default in desktop, controls menu changes re: flying	2018-07-23 15:19:46 -07:00
Alexander Ivash	e12569c747	FB16992 - Layout changes to the two lightboxes in the Avatar app	2018-07-23 23:24:17 +03:00
Alexander Ivash	091de4a9b5	Avatarapp: hover animate 'get more avatars'	2018-07-23 22:33:47 +03:00
MuteTab	97e5d65592	Added conditional check for VR vs non-VR menu.	2018-07-19 14:30:06 -07:00
Qliemillar	566c837bba	Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix ... fix 'the drop down does not shows the wearable'	2018-07-19 12:23:48 -06:00
Wayne Chen	37131d75e9	Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537 ... MS16537: Updating "Forgot Username/Forgot Password" behavior	2018-07-18 16:32:55 -07:00
howard-stearns	0a47672d64	machinery for fetching next page of inifinite scroll before it really ... needed, and use in our infinite scrolls	2018-07-18 13:00:03 -07:00
Alexander Ivash	fe96ad2389	fix 'the drop down does not shows the wearable'	2018-07-18 21:16:47 +03:00
Wayne Chen	0cbcae9181	reverting onLinkActivated brackets	2018-07-18 10:44:37 -07:00
Zach Fox	919bfce7ab	Simplify	2018-07-18 09:00:01 -07:00
Wayne Chen	3b7f88a4a8	Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537	2018-07-17 17:08:43 -07:00
Zach Fox	ef4265de4b	Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button	2018-07-17 16:16:43 -07:00
Zach Fox	7cdb84ee68	Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup ... Fix MS16562: Massive PAL speedup!	2018-07-16 16:45:01 -07:00
Zach Fox	4daa0c6537	CR feedback	2018-07-13 12:47:45 -07:00
John Conklin II	33fb759c0a	Merge pull request #13599 from danteruiz/fix-combobox ... fixing combo boxes	2018-07-13 10:33:33 -07:00
Zach Fox	2da911ad84	Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup	2018-07-13 09:47:49 -07:00
Zach Fox	04f856019d	Fix MS16701: Uninstall installed app before updating	2018-07-12 16:27:19 -07:00
Zach Fox	92756d81ad	Implement MS16562: Massive PAL speedup!	2018-07-12 15:05:31 -07:00
Wayne Chen	089831b6ee	Adding potential fix	2018-07-12 14:15:16 -07:00
Dante Ruiz	1c64ebc3ca	fixing combo boxes	2018-07-12 13:57:48 -07:00
Sam Gondelman	2597568a0a	Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls ... Rollback PR 12888 by deleting alternative +android files	2018-07-12 12:06:35 -07:00
Cristian Luis Duarte	b1d39e4959	Rollback PR 12888 by deleting alternative +android files	2018-07-11 21:21:12 -03:00
Zach Fox	bf4954d667	Fix MS16615: Don't early-remove .app.json we JUST installed	2018-07-11 15:27:43 -07:00
Sam Gateau	54d2f42fa4	Merge pull request #13544 from Zvork/haze ... Fix haze on Mac (bug #15515)	2018-07-11 20:04:22 +02:00
howard-stearns	8b713a437f	don't store undefined in a qml int.	2018-07-10 12:14:31 -07:00
howard-stearns	886df959d1	expose totalPages and totalEntries, and use the later to display ... connections count	2018-07-10 11:26:23 -07:00