Commit graph

64 commits

Author SHA1 Message Date
David Kelly
21cc6ee8dd fix marketplace txn display (memo only) 2018-01-18 14:28:25 -08:00
David Kelly
2b7576cef5 Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory 2018-01-18 13:00:07 -08:00
David Kelly
9a523ead31 fix link 2018-01-18 12:44:45 -08:00
David Kelly
2cdbc1159e nearby hfc transfers should send the location too 2018-01-18 11:15:32 -08:00
David Kelly
c661bec8fd whitespace 2018-01-17 17:15:14 -08:00
David Kelly
1dde25e38f Don't make links in txn history for highfidelity and marketplace 2018-01-17 16:51:38 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1
Commerce: P2P Transfer Iteration 1
2018-01-17 16:41:56 -08:00
Zach Fox
16d51986a9 Make the call to receiveAt more robust 2018-01-17 15:11:58 -08:00
Zach Fox
e700ff91d0 Remove warning 2018-01-16 15:58:17 -08:00
David Kelly
929760c226 fix time display 2018-01-16 14:52:26 -08:00
David Kelly
d8f8f9ff1a First cut at alan's new design 2018-01-16 11:19:10 -08:00
David Kelly
6cedc016c4 Adding sender/recipient to transaction history for hfc transfers 2018-01-12 16:08:52 -07:00
David Kelly
579a4d85b3 Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory 2018-01-12 14:37:46 -07:00
Zach Fox
81ab5ac81c hfc_key -> public_key 2018-01-11 12:50:25 -08:00
howard-stearns
c39771d995 do not delete wallet file when things go wrong, and remove obsolete
reset machinery
2018-01-11 11:50:23 -08:00
Zach Fox
939012a2d0 Hook up the endpoints! 2018-01-10 17:10:05 -08:00
Zach Fox
edf25c3e4e Remove code duplication... 2018-01-09 14:14:54 -08:00
Zach Fox
d31dec7acb Fix unix build errors 2018-01-09 12:41:56 -08:00
Zach Fox
360a7cc4c6 CR feedback 2018-01-09 11:08:18 -08:00
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -08:00
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -08:00
Zach Fox
4232bc0200 Bump per_page to 100 2018-01-04 14:42:05 -08:00
Zach Fox
14447c26a0 Prevent visual data loss 2018-01-04 13:47:31 -08:00
Zach Fox
10d494b51d Pagination for Recent Activity 2018-01-04 12:32:30 -08:00
Zach Fox
73eb258e79 IT'S WORKING!!! 2017-12-21 15:17:52 -08:00
Zach Fox
e963673409 Progress? 2017-12-21 14:08:18 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
howard-stearns
07d52306c4 consolidated blockchain history log 2017-11-19 22:51:36 -08:00
Zach Fox
19b7c6e025 Remove machine fingerprint from receiveAt 2017-11-08 17:15:27 -08:00
Zach Fox
38fde43009 ...simplify your life 2017-11-08 13:19:47 -08:00
Zach Fox
7995f50fab Fix seeding 2017-11-08 12:52:53 -08:00
Zach Fox
3190fe1f32 Use keyfilepath instead of cached public keys 2017-11-08 12:30:48 -08:00
Zach Fox
b7163bb8fc Frontend changes 2017-11-08 10:25:11 -08:00
Zach Fox
8f54c106f6 Could it be this simple? 2017-11-07 12:12:27 -08:00
Zach Fox
c496429a85 Add Machine Fingerprint to receive_at endpoint txn' 2017-11-03 10:40:25 -07:00
Zach Fox
3e139283ba Remove unnecessary newlines 2017-10-23 17:31:21 -07:00
Zach Fox
fbd393d918 Add newline to cert ID when updating location 2017-10-20 15:10:24 -07:00
Zach Fox
bcbddb7106 Fix unix warnings 2017-10-14 14:13:19 -07:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Zach Fox
f037eab26c Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-11 11:07:32 -07:00
Zach Fox
4ebccfa65c Use put instead of get sob 2017-10-10 16:23:43 -07:00
Zach Fox
5e383e2b1c My Item certificates 2017-10-10 14:56:17 -07:00
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -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
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
David Kelly
655dc61ff2 doh 2017-09-01 10:16:45 -07:00
David Kelly
1eb503f526 we are qt5.6 on mac 2017-08-31 16:49:12 -07:00