Commit graph

69 commits

Author SHA1 Message Date
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -07:00
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
Zach Fox
0e96fc5cab It's working! 2017-10-12 11:37:26 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Zach Fox
c3e66c9581 Fixes 2017-10-11 16:56:47 -07:00
Zach Fox
9e570fdba3 First pass at encryption/decryption. Exciting! 2017-10-11 13:08:04 -07:00
Zach Fox
0ae69b6ad9 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-10 12:38:14 -07:00
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Zach Fox
38b95b5403 Instructions HTML file and flow 2017-10-09 15:07:14 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Zach Fox
1ed10ecf59 Fix passphrase crash 2017-10-04 11:05:17 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -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
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
David Kelly
61e8458d13 some cleanup 2017-09-12 08:08:41 -07:00
David Kelly
5c12403b7c first working pass at single file. Cleanup needed 2017-09-11 16:40:21 -07:00
David Kelly
4acbc2bfba Just write the image file in the format we will use later 2017-09-11 13:03:21 -07:00
David Kelly
c142215935 oops -- this is a windows-only thing (like so many other problems) 2017-09-08 12:52:12 -07:00
David Kelly
3e0b222ec4 fix wallet for new openssl 2017-09-08 11:44:19 -07:00
David Kelly
bb07a586ca warning, plus salting passphrase now 2017-09-07 19:24:31 -07:00
David Kelly
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
David Kelly
350cee5f35 Wallet cleanup 2017-09-05 16:33:16 -07:00
David Kelly
3bc45aefb1 Reset passphrase fix 2017-09-05 10:04:16 -07:00
David Kelly
47cd47f819 log when no passphrase was set before trying to decrypt 2017-09-01 14:50:45 -07:00
David Kelly
feaa8d3120 Someday, a real rain will come and wash Wallet.cpp
Till then, this little change will have to do.
2017-09-01 14:06:43 -07:00
David Kelly
9fe6ce0337 working change passphrase. some cleanup to come 2017-09-01 13:11:56 -07:00
David Kelly
451936214d initial stab at changing passphrase 2017-08-31 17:05:55 -07:00
Zach Fox
eab2947d40 Auth flow 2017-08-31 15:16:29 -07:00
Zach Fox
21a73b2f39 Changes in what I think are the right direction 2017-08-31 13:16:10 -07:00
Zach Fox
914a6bae00 Commerce: Wallet Passphrase Modal 2017-08-31 12:18:38 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
howard-stearns
b8da08ca42 reset wallet 2017-08-30 11:29:43 -07:00
David Kelly
a2b1cfc7ac security image shows up in every qml engine now 2017-08-29 17:06:57 -07:00
David Kelly
67f25adac0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-29 08:02:53 -07:00
David Kelly
a7af114144 fix wallet, use text from server in history (for now) 2017-08-28 17:04:19 -07:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -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
David Kelly
5bbe3c5a94 Merge pull request #11246 from davidkelly/dk/encryptionBug
security image bug
2017-08-25 14:14:22 -07:00
Zach Fox
e606e3dfb3 Squashed commit of the following:
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date:   Fri Aug 25 10:56:53 2017 -0700

    Huge cleanup!
2017-08-25 11:45:37 -07:00
David Kelly
0f722992a5 add delete to client of decryptFile 2017-08-25 11:24:37 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
David Kelly
c316e50f0f security image bug 2017-08-25 10:29:40 -07:00
David Kelly
d398adc195 warnings 2017-08-24 08:48:26 -07:00
David Kelly
c77dafdf12 fix warnings, prepare a bit for hooking up the passphrase 2017-08-23 17:43:37 -07:00