Commit graph

60 commits

Author SHA1 Message Date
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
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -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
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -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
H Q
4ce784291c Provides a nice alert in case of insufficient funds to make a purchase 2017-12-07 15:13:01 -08: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
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Zach Fox
4334bf8222 Add data tracking for purchase and rez 2017-12-05 13:09:09 -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
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Zach Fox
e8c4878c8f Fix rezzing non-JSON marketplace items 2017-11-15 11:25:18 -08:00
Zach Fox
f5994375cf Remove Marketplace's dependency on Edit.js for rez 2017-11-14 14:29:49 -08:00
Zach Fox
149c8fbeb2 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-06 09:25:30 -08:00
Zach Fox
9481824d0a Fix enabled status of wear button 2017-10-26 17:02:09 -07:00
Zach Fox
dafa830c0d First steps 2017-10-25 14:44:59 -07: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
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
Zach Fox
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -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
b81a8a95ea Final fixes 2017-10-09 15:23:22 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Zach Fox
acdd1e32e4 First round 2017-10-09 12:11:07 -07:00
Zach Fox
0b600a74c3 Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout 2017-10-05 14:34:53 -07:00
Zach Fox
fcafbef109 Fix buying free items using Commerce system 2017-10-04 09:34:32 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
Zach Fox
4668294389 Fix login flow regression 2017-09-29 15:25:24 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
Zach Fox
3a537cdcc3 Make usernameDropdown collapse when clicking anywhere outside it 2017-09-28 13:21:55 -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
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Zach Fox
0a9e3e8967 Remove unnecessary code 2017-08-31 15:46:37 -07:00
Zach Fox
2c2500875f Fixes and improvements 2017-08-31 15:39:58 -07:00
Zach Fox
eab2947d40 Auth flow 2017-08-31 15:16:29 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
David Kelly
cdadaa8c9c missed one 2017-08-31 13:41:53 -07:00
David Kelly
8fbdd207c8 display hfc in "pennies" 2017-08-31 12:10:12 -07:00
Zach Fox
fb4b0f60fa Remove most dependencies on 'onVisibleChanged' 2017-08-30 11:55:29 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
6ee634b90a Lock overlay on top of security image 2017-08-29 17:19:34 -07:00
Zach Fox
c7ad875485 Virtual keyboard and logic 2017-08-29 15:27:53 -07:00
Zach Fox
1c1b841a86 Fix security images; actually do the right thing when wallet not set up 2017-08-28 12:18:53 -07:00
Zach Fox
ea00668725 Again to Another 2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027 Remove quantity 2017-08-28 09:58:45 -07:00