Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 10:20:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69512 commits 25 branches 0 tags 1.1 GiB
Commit graph

229 commits

Author SHA1 Message Date
Zach Fox
e64b0861a1 Change passphrase working 2017-10-03 10:53:10 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
Zach Fox
2b03e08c96 Fix errant status when requesting it for the first time 2017-10-02 10:20:24 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Zach Fox
65a63ea8c3 Remove dead OS X code 2017-09-28 09:38:22 -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
90316e275a Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal 2017-09-01 13:33:23 -07:00
David Kelly
9fe6ce0337 working change passphrase. some cleanup to come 2017-09-01 13:11:56 -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
David Kelly
655dc61ff2 doh 2017-09-01 10:16:45 -07:00
David Kelly
451936214d initial stab at changing passphrase 2017-08-31 17:05:55 -07:00
David Kelly
1eb503f526 we are qt5.6 on mac 2017-08-31 16:49:12 -07:00
Zach Fox
eab2947d40 Auth flow 2017-08-31 15:16:29 -07:00
David Kelly
f8341ce1da warning 2017-08-31 13:24:07 -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
8fbdd207c8 display hfc in "pennies" 2017-08-31 12:10:12 -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
Zach Fox
e0878e7a3f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2 2017-08-30 11:07:24 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -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
b942faa60e Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-25 14:16:31 -07:00
David Kelly
5bbe3c5a94 Merge pull request #11246 from davidkelly/dk/encryptionBug 
security image bug
 2017-08-25 14:14:22 -07:00
David Kelly
f015ac3c68 get transaction history into qml 2017-08-25 13:55:38 -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
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00
David Kelly
8bb7ea900a Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-22 16:23:23 -07:00
David Kelly
0bd3f1728d Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile 2017-08-22 14:40:10 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
David Kelly
1904bd3f2b encrypting image, rough first pass, lots left 2017-08-18 16:14:10 -07:00
howard-stearns
29b717e22d remove dead code 2017-08-18 14:08:04 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
Zach Fox
ccf81f801d All the pieces! 2017-08-17 17:06:48 -07:00
Zach Fox
9135e37078 Go go go go gog o 2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
David Kelly
73e943daaf Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-16 10:13:08 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Zach Fox
528d2072f9 Bugfixes and improvements 2017-08-15 12:14:32 -07:00
David Kelly
0f7db74ef1 missed a couple warnings 2017-08-15 11:44:15 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
David Kelly
a6390edf46 ugh 2017-08-15 10:10:48 -07:00
David Kelly
c08fce967f forgot a warning 2017-08-15 08:58:16 -07:00
David Kelly
ef5863d169 warnings squashed 2017-08-14 16:24:50 -07:00
David Kelly
170d2b186b url encode the base64 signature/key 2017-08-14 13:48:09 -07:00
David Kelly
803a5c6690 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-14 13:15:04 -07:00
David Kelly
b4b592cc00 one key file with (for now) both public and private keys in there 2017-08-14 12:53:10 -07:00
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -07:00
David Kelly
f784bc42de Initial cut using RSA keys for now 2017-08-11 16:54:04 -07:00
howard-stearns
551ea921cd Make API asynchronous, for communicating with server 2017-08-11 11:45:40 -07:00
howard-stearns
8f0fd10e2b fix 2017-08-10 12:51:05 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
howard-stearns
f1ab91edd1 PR feedback 2017-08-09 12:41:16 -07:00
howard-stearns
7414bf0d9a oops. didn't test what I thought I did 2017-08-09 12:09:03 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
howard-stearns
9bad26c2db stub files 2017-08-07 12:51:30 -07:00