Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 06:00:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 72 branches 59 tags 1.2 GiB
Commit graph

178 commits

Author SHA1 Message Date
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2 
Commerce: Pixel-perfect "Send Money" UI
 2018-01-22 09:39:23 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
Zach Fox
89e403d438 Balance text in send money 2018-01-19 15:39:57 -08:00
Zach Fox
4d408a8df5 Nearby UI 2018-01-19 14:49:28 -08:00
Zach Fox
495c4f56e2 Only small tweaks remaining? 2018-01-18 17:51:08 -08:00
Zach Fox
6b5389a167 go go go go go 2018-01-18 17:37:26 -08:00
Zach Fox
c6429f4f33 Path towards pixel perfection 2018-01-18 17:05:36 -08:00
David Kelly
844ec6a863 eliminate dash in history, replace with 0 HFC 2018-01-18 16:02:40 -08:00
Zach Fox
8cc427a374 Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 15:07:53 -08:00
Zach Fox
8cc5a0a7cb Add UserInfoViewer 2018-01-16 15:06:51 -08:00
David Kelly
a9fc63da4c fix error when pending 2018-01-16 15:04:05 -08:00
Zach Fox
d64b35729f Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 13:44:29 -08:00
David Kelly
d8f8f9ff1a First cut at alan's new design 2018-01-16 11:19:10 -08:00
Zach Fox
6b90ceaeb4 Quick bugfix and code change for clarity 2018-01-16 10:40:51 -08:00
Zach Fox
f7ed8c10fa Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-15 10:13:07 -08: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
c216144015 Remove unnecessary comments 2018-01-11 16:21:59 -08:00
Zach Fox
464bbe5d43 Bugfixes, refactoring, and improvements 2018-01-11 15:26:51 -08:00
Zach Fox
1e608b13b2 Show username when admin (this probably isn't the way to get username 2018-01-11 14:45:43 -08:00
Zach Fox
df58065e75 Silly bug 2018-01-11 13:02:00 -08:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -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
d577b2e9e8 Actually add the API calls 2018-01-11 11:45:43 -08:00
Zach Fox
939012a2d0 Hook up the endpoints! 2018-01-10 17:10:05 -08:00
Zach Fox
0d137d62c8 HMD tweaks 2018-01-10 16:37:47 -08:00
Zach Fox
b3e3af4ee7 Add character count :) 2018-01-10 16:23:29 -08:00
Zach Fox
260aee42a8 Improvements 2018-01-10 16:18:34 -08:00
Zach Fox
93b15c0aa6 Payment Failure 2018-01-10 15:53:13 -08:00
Zach Fox
6812010660 The skeleton is there 2018-01-10 15:33:18 -08:00
Zach Fox
22631065e4 Serious flow state 2018-01-10 15:09:15 -08:00
Zach Fox
c5a5bddbc9 More progress 2018-01-10 12:21:12 -08:00
Zach Fox
e5abdc77d9 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 10:02:56 -08:00
Zach Fox
f366fdf695 Beginnings of nearby 2018-01-10 09:58:23 -08:00
Zach Fox
5469025113 More more more 2018-01-09 15:53:25 -08:00
Zach Fox
530df5447d Even more proress 2018-01-09 15:19:50 -08:00
Zach Fox
40a3f8b31b Progress 2018-01-09 14:13:36 -08:00
Zach Fox
a6259a5ef5 Initial progress 2018-01-09 13:39:28 -08:00
Zach Fox
611f25d542 Improve scrolling thru My Purchases 2018-01-08 13:17:04 -08:00
Zach Fox
2231bf2bdd Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-08 11:45:20 -08:00
Alexander Ivash
437b78dce5 FB10621 "HIFI-Commerce Login" page title change to "Log in to continue" 2018-01-05 13:35:19 +03:00
Zach Fox
4612ef3d7c Use atYBeginning 2018-01-04 15:41:01 -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
6f077f3a92 Fix Security Pic Change dialog after QML security changes 2018-01-03 11:28:39 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
Zach Fox
e02e6790fe Fix error state for Commerce passphrase TextInputs 2017-12-20 13:46:02 -08:00
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
a72ed27a25 CR feedback 2017-12-19 16:57:48 -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