howard-stearns
|
16a58ddf5a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
|
2017-12-19 10:48:34 -08:00 |
|
Zach Fox
|
18d5be147c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-19 09:48:15 -08:00 |
|
Zach Fox
|
6fc58b713e
|
Merge pull request #12009 from zfox23/commerce_dataTracking2
Commerce: Add Passphrase Auth Status data tracking
|
2017-12-18 16:26:59 -08:00 |
|
Zach Fox
|
afd3cf7045
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-18 14:08:09 -08:00 |
|
Zach Fox
|
e075cd79fb
|
Add Passphrase Auth Status data tracking
|
2017-12-18 11:51:12 -08:00 |
|
vladest
|
38453afb3b
|
Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope
|
2017-12-18 14:56:33 +01:00 |
|
vladest
|
62a762b879
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-16 20:32:21 +01:00 |
|
vladest
|
cdb9d72387
|
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
|
2017-12-16 20:27:19 +01:00 |
|
howard-stearns
|
d730b7b87b
|
consistent goToUser behavior in PAL, and be able to go to flying user.
|
2017-12-15 17:00:54 -08:00 |
|
Zach Fox
|
89795272c7
|
More security images!
|
2017-12-15 16:26:13 -08:00 |
|
Zach Fox
|
3764445272
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-13 14:12:08 -08:00 |
|
Seth Alves
|
d3e24d3629
|
Merge pull request #11960 from ElderOrb/FB10334
10334 Unable to type in Go To app search bar after UI reappears from …
|
2017-12-13 09:06:53 -08:00 |
|
vladest
|
99a6b12828
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-13 16:02:29 +01:00 |
|
vladest
|
e052784431
|
Code style
|
2017-12-12 14:12:03 +01:00 |
|
Zach Fox
|
2225352b1e
|
Fix wallet setup
|
2017-12-11 17:15:15 -08:00 |
|
Howard Stearns
|
8e36228c12
|
Merge pull request #11948 from MandatoryMania/noFundsSymbol
Provides a nice alert in case of insufficient funds to make a purchase
|
2017-12-11 11:45:27 -08:00 |
|
Zach Fox
|
b81cdf49ef
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-11 09:52:32 -08:00 |
|
vladest
|
e797f5cda0
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-11 17:53:21 +01:00 |
|
vladest
|
cc78fc1f53
|
Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections
|
2017-12-11 17:50:16 +01:00 |
|
Alexander Ivash
|
cb471582e5
|
10334 Unable to type in Go To app search bar after UI reappears from moving Avatar
|
2017-12-10 01:34:03 +03:00 |
|
humbletim
|
abba85ac54
|
add missing colonsemi
|
2017-12-08 18:14:30 -05:00 |
|
humbletim
|
34243f4239
|
disable connections console.log to prevent UI lag
|
2017-12-08 17:10:57 -05:00 |
|
vladest
|
3aaf666295
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-08 19:59:41 +01:00 |
|
Zach Fox
|
a81a981676
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-08 09:44:52 -08:00 |
|
Seth Alves
|
eda63e5758
|
Merge pull request #11919 from ElderOrb/FB9706
9706 Editing Attachments Results In Attachments Window Scrolling To Top
|
2017-12-08 07:01:00 -08:00 |
|
H Q
|
4ce784291c
|
Provides a nice alert in case of insufficient funds to make a purchase
|
2017-12-07 15:13:01 -08:00 |
|
vladest
|
9b3db0725b
|
Retreive buttons list from tablet proxy
|
2017-12-07 22:36:34 +01:00 |
|
Zach Fox
|
b2bafed2bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-07 11:21:24 -08:00 |
|
vladest
|
c9f86e4b6b
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-07 19:16:13 +01:00 |
|
vladest
|
3c11d29a7f
|
Something intermediate
|
2017-12-07 19:13:39 +01:00 |
|
Brad Hefta-Gaub
|
88ed15aaaa
|
Merge pull request #11942 from ctrlaltdavid/21633
Fix image overlay's subImage property's width and height support
|
2017-12-07 09:19:43 -08:00 |
|
David Rowe
|
efd72be96f
|
Fix image overlay's subImage property's width and height support
|
2017-12-07 12:05:46 +13: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 |
|
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 |
|
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 |
|
vladest
|
a0878298d5
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-04 20:55:38 +01: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 |
|
Alexander Ivash
|
d60f082796
|
9706 Editing Attachments Results In Attachments Window Scrolling To Top
|
2017-12-03 23:24:34 +03:00 |
|
vladest
|
e1df38784b
|
Merge branch 'master' into tablet_home_paginate
|
2017-12-02 22:40:10 +01:00 |
|
vladest
|
fd9539a9e4
|
Using Flickable signals to remove hover state instead of timer. No more delays
|
2017-12-02 13:57:12 +01: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
|
ebb2e50d01
|
Fix month display in commerce...
|
2017-12-01 09:29:19 -08:00 |
|
vladest
|
570be69fcf
|
Fix warnings after apps closed
|
2017-12-01 09:52:45 +01: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 |
|
vladest
|
f510b4bcd8
|
Swipe area expanded to whole tablet. Icons doesnt stick together anymore
|
2017-11-30 21:10:12 +01:00 |
|
vladest
|
69264a6ea8
|
Merge with master. Conflicts solved
|
2017-11-30 15:34:21 +01:00 |
|
Zach Fox
|
3c892920e3
|
Prevent seeding text from flashing
|
2017-11-28 17:00:15 -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 |
|
MiladNazeri
|
83d13717fe
|
Merge pull request #11752 from Menithal/21539
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
|
2017-11-27 16:02:01 -08:00 |
|
Menithal
|
693da50a68
|
21539: Fixed None Checkmark being on Desktop mode
|
2017-11-27 07:59:04 +02:00 |
|
Menithal
|
5d52b9936b
|
21539: Updated Logic to match request
|
2017-11-27 07:42:18 +02:00 |
|
Menithal
|
ba1cd74ffe
|
21539: Moved Desktop HMD to None
|
2017-11-26 21:58:16 +02:00 |
|
Zach Fox
|
fada02a76c
|
Merge pull request #11864 from zfox23/commerce_newHelpText
New Help questions/answers/link
|
2017-11-22 12:53:16 -05:00 |
|
Zach Fox
|
d2ebfbf064
|
New Help questions/answers/link
|
2017-11-21 18:55:48 -05:00 |
|
Howard Stearns
|
4018b99118
|
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
Turn Commerce on by default!
|
2017-11-20 16:18:53 -08:00 |
|
Brad Hefta-Gaub
|
e070033ce4
|
Merge pull request #11793 from ElderOrb/FB9032
9032 - Current display mode can be deselected in the toolbar/tablet menu
|
2017-11-19 11:25:35 -08:00 |
|
Brad Hefta-Gaub
|
ff8ca6da4c
|
Merge pull request #11303 from vladest/webbrowser_updates
Webbrowser updates
|
2017-11-19 11:11:09 -08:00 |
|
Brad Hefta-Gaub
|
1de6ecec30
|
Merge pull request #11830 from ElderOrb/FB8244
8244 Rename captionColorOverride to captionColor
|
2017-11-18 14:28:32 -08:00 |
|
Brad Hefta-Gaub
|
0678a7c9df
|
Merge pull request #11718 from kencooke/audio-louder-mastergain
Adjustable master avatar volume
|
2017-11-17 16:58:27 -08:00 |
|
Zach Fox
|
d31578abae
|
FIXME LATER! Remove mouseareas from passphrase screens
|
2017-11-17 15:47:02 -08:00 |
|
Zach Fox
|
7d34b3fe67
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-11-17 15:45:03 -08:00 |
|
Zach Fox
|
ec16f16757
|
Remove debug buttons from wallet
|
2017-11-17 15:21:18 -08:00 |
|
Zach Fox
|
4cc8db8aff
|
Merge pull request #11843 from zfox23/commerce_fixMyItems
Fix 'My Items' display
|
2017-11-17 12:59:51 -08:00 |
|
Dante Ruiz
|
4de0fdf7d1
|
Merge pull request #11768 from ctrlaltdavid/21596
Add instructions and cursor to GOTO dialog input
|
2017-11-17 11:45:40 -08:00 |
|
Zach Fox
|
f570e3c874
|
Fix 'My Items' display
|
2017-11-17 11:27:00 -08:00 |
|
Zach Fox
|
7f64ede940
|
Fix skipping wallet setup step in certain cases
|
2017-11-16 11:44:52 -08:00 |
|
Alexander Ivash
|
c5d2f598d7
|
8244 Rename captionColorOverride to captionColor
|
2017-11-16 15:46:49 +03:00 |
|
Zach Fox
|
9f80a5f081
|
Merge pull request #11817 from zfox23/commerce_rezFix
Fix rezzing non-JSON marketplace items
|
2017-11-15 14:17:05 -08:00 |
|
Brad Davis
|
26a745be6f
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-15 11:59:06 -08:00 |
|
Brad Davis
|
1167be4102
|
Reverting tablet API rename, cleaning up duplicated code
|
2017-11-15 11:52:55 -08:00 |
|
Zach Fox
|
e8c4878c8f
|
Fix rezzing non-JSON marketplace items
|
2017-11-15 11:25:18 -08:00 |
|
Dante Ruiz
|
d83f3152dd
|
Merge pull request #11809 from ElderOrb/FB8984
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-15 11:16:49 -08:00 |
|
Howard Stearns
|
1c293c4c48
|
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
Remove Marketplace's dependency on Edit.js for REZ/WEAR
|
2017-11-14 16:33:35 -08:00 |
|
Zach Fox
|
f5994375cf
|
Remove Marketplace's dependency on Edit.js for rez
|
2017-11-14 14:29:49 -08:00 |
|
Zach Fox
|
c42003a374
|
Merge pull request #11794 from ElderOrb/FB4684_3
4684 Add collapse button on the virtual keyboard
|
2017-11-14 12:22:42 -08:00 |
|
Alexander Ivash
|
e201e203b8
|
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-14 22:18:48 +03:00 |
|
Zach Fox
|
5290ee3b4e
|
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
|
2017-11-14 10:07:44 -08:00 |
|
Brad Davis
|
d71fd151c5
|
Fixing button model exposure
|
2017-11-13 16:45:27 -08:00 |
|
Zach Fox
|
a3332e15b7
|
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
|
2017-11-13 15:01:26 -08:00 |
|
Brad Davis
|
69029b49f3
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-13 14:29:49 -08:00 |
|
Brad Davis
|
8f85c7650b
|
Make sure loaded components get the right parent context
|
2017-11-13 14:16:04 -08:00 |
|
Zach Fox
|
641c4656c4
|
Fix bug with disappearing certificate info
|
2017-11-13 10:53:16 -08:00 |
|
Brad Davis
|
5cf9c1bb33
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-13 10:48:21 -08:00 |
|
Ryan Downe Karpf
|
f8b1c7978c
|
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
[Case 6569]: Silent failure is possible during Model Creation
|
2017-11-12 08:36:10 -08:00 |
|
vladest
|
50ea08f3d5
|
VR stylus and laser need longer timeout than mouse
|
2017-11-11 16:10:00 +01:00 |
|