Commit graph

40 commits

Author SHA1 Message Date
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Zach Fox
d4e9a70564 Almost there 2018-10-31 16:12:16 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
Zach Fox
68e6142f8b Follow wallet setup referrer when autogenerating new wallet 2018-09-14 15:34:00 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2
Move to qqc2
2018-04-12 11:26:55 -07:00
Zach Fox
a2f5891a0b Cleanup 'Private' HMD Preview State Machine Logic 2018-04-10 16:00:18 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Zach Fox
f20eddefc8 Fix 'Private' HMD preview texture enable/disable...again 2018-04-03 13:46:02 -07:00
vladest
6a5fe0d513 Merge branch 'master' into move_to_qqc2 2018-02-27 15:23:52 +01:00
Alexander Ivash
611c67bf2f FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard 2018-02-15 02:00:51 +03:00
vladest
e8959b4cc0 Merge branch 'master' into move_to_qqc2 2018-02-13 22:01:16 +01:00
Zach Fox
19235b8d94 Fix a bug where hover events incorrectly propagate under popups 2018-02-02 10:50:35 -08:00
vladest
1c63bcf02e Merge branch 'master' into move_to_qqc2 2018-01-31 22:13:52 +01:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
vladest
2fbd0a41b1 Move Slider 2017-12-28 15:39:22 +01:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-20 09:18:10 -08:00
Zach Fox
a72ed27a25 CR feedback 2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -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
89795272c7 More security images! 2017-12-15 16:26:13 -08:00
vladest
2770650b65 Merge branch 'master' into move_to_qqc2 2017-12-12 18:48:41 +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
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -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
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
34fe517c67 Merge conflicts 2017-11-18 18:48:33 +01: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
7f64ede940 Fix skipping wallet setup step in certain cases 2017-11-16 11:44:52 -08:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
Zach Fox
dafa830c0d First steps 2017-10-25 14:44:59 -07:00
Zach Fox
6b7c997a4c Minor text tweak 2017-10-13 13:37:11 -07:00
Zach Fox
38b95b5403 Instructions HTML file and flow 2017-10-09 15:07:14 -07:00
Zach Fox
1d1b846f39 Better 'view backup instructions' behavior 2017-10-02 12:44:51 -07:00
Zach Fox
bbbce96407 Fix gray securityimage 2017-09-29 14:30:02 -07:00
Zach Fox
3742ccbdd3 Fix keyboard focus during setup while tip is up 2017-09-28 13:12:42 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463)
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00