Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 14:56:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76556 commits 74 branches 59 tags 1.2 GiB
Commit graph

101 commits

Author SHA1 Message Date
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00
Zach Fox
02307d2308 Secret to Coupon ID 2018-12-05 16:34:53 -08:00
Zach Fox
bc39dbba8b Finish out the feature 2018-11-29 12:44:30 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Howard Stearns
05becb870f remove urls from logs in Interface 2018-11-06 13:47:07 -08:00
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Roxanne Skelly
1f8dde6756 Transaction string was assuming items given to the 
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
 2018-11-01 15:44:11 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
Howard Stearns
88a3505b6a cleanup 2018-08-22 14:30:27 -07:00
Howard Stearns
13629f6870 bypass setup and password, and convert old wallets to account based 
before lockering
 2018-08-22 14:30:27 -07:00
Howard Stearns
ef1aacd226 handle password changes 2018-08-22 14:30:27 -07:00
Howard Stearns
ef9cc782b9 no need to keep old format in client 2018-08-22 14:30:16 -07:00
Howard Stearns
73cca42940 initial prototype 2018-08-22 14:29:34 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f It's working 2018-05-16 12:17:17 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Zach Fox
0504220171 Abide by new backend code 2018-04-16 13:01:31 -07:00
Zach Fox
ffab27d442 Commerce: Fix Certificate Info error 2018-04-10 15:54:55 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Zach Fox
bf48ecda6d Fix cert location for content sets 2018-03-26 14:48:05 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
Zach Fox
22f18dbf56 Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd 2018-03-08 13:12:13 -08:00
Zach Fox
d71fc22ed8 Support argument to available_updates endpoint 2018-03-07 14:06:29 -08:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
howard-stearns
5e78de61ee remove debugging 2018-02-25 15:24:08 -08:00
howard-stearns
300f611c47 working, with soft reset 2018-02-25 14:06:06 -08:00
howard-stearns
f66e688f41 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:12:41 -08:00
howard-stearns
1aaae94cc1 checkpoint 2018-02-22 17:04:27 -08:00
Zach Fox
5a8b8d4ac8 Lots of changes 2018-02-14 16:44:02 -08:00
Zach Fox
1b7253dc7f Already Owned endpoint 2018-02-13 13:54:50 -08:00
David Kelly
844ec6a863 eliminate dash in history, replace with 0 HFC 2018-01-18 16:02:40 -08:00
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