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

357 commits

Author SHA1 Message Date
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -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
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -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
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3 
Commerce Data Tracking: Iteration 3 (Purchases)
 2017-12-22 14:31:03 -08:00
Zach Fox
ef71470d85 Small change 2017-12-21 17:03:04 -08:00
Zach Fox
2acea75db3 Commerce: Checkout Layout Revisions 2017-12-21 16:09:46 -08:00
Zach Fox
618e5c9032 Commerce Data Tracking: Iteration 3 (Purchases) 2017-12-21 15:46:01 -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
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2 
Commerce: Add Passphrase Auth Status data tracking
 2017-12-18 16:26:59 -08:00
Zach Fox
afd3cf7045 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-18 14:08:09 -08:00
Zach Fox
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -08:00
Zach Fox
89795272c7 More security images! 2017-12-15 16:26:13 -08:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Zach Fox
2225352b1e Fix wallet setup 2017-12-11 17:15:15 -08:00
H Q
4ce784291c Provides a nice alert in case of insufficient funds to make a purchase 2017-12-07 15:13:01 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -08:00
Zach Fox
902064ed37 Cleanup debug stuff 2017-12-05 15:26:55 -08:00
Zach Fox
c807fc80e3 Add marketplace cta referrer 2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5 Add data tracking for wallet setup 2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222 Add data tracking for purchase and rez 2017-12-05 13:09:09 -08:00
Zach Fox
c80039ea87
Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1 
Fix gray/incorrect security image after relog
 2017-12-05 11:21:06 -08:00
Zach Fox
1507620fd5
Merge pull request #11921 from ElderOrb/FB10024 
10024 Wallet: TextField Focus Problems
 2017-12-05 10:52:08 -08:00
Zach Fox
d59c9bd73a Fix gray/incorrect security image after relog 2017-12-05 10:27:40 -08:00
Alexander Ivash
f7328f05fb remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface 2017-12-05 00:51:42 +03:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation 
Call reset() on Wallet before creating new wallet
 2017-12-04 13:05:36 -08:00
Alexander Ivash
8a5904373b remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button 2017-12-05 00:04:46 +03:00
Alexander Ivash
c67ff3b5d8 10024 Wallet: TextField Focus Problems 
note: removed excessive MouseArea-s
 2017-12-05 00:03:48 +03:00
Howard Stearns
e2efe062fe
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh 
Don't refresh Inventory or Recent Activity if data hasn't changed
 2017-12-01 13:57:34 -08:00
Zach Fox
ebb2e50d01 Fix month display in commerce... 2017-12-01 09:29:19 -08:00
Zach Fox
24e5994f20 The nuclear option is a bad option. 2017-11-30 15:55:09 -08:00
Zach Fox
009d3a18a3 Call reset() on Ledger and Wallet before creating new wallet 2017-11-30 15:40:20 -08:00
Zach Fox
3c892920e3 Prevent seeding text from flashing 2017-11-28 17:00:15 -08:00
Zach Fox
5dc8715879 Bugfix 2017-11-28 16:14:17 -08:00
Zach Fox
489d11d5fd Remove logging 2017-11-28 16:01:58 -08:00
Zach Fox
3e5a2addd2 Use same logic for Recent Activity 2017-11-28 16:00:46 -08:00
Zach Fox
e769d2fbc3 Don't refresh Inventory or Recent Activity if data hasn't changed 2017-11-28 15:44:42 -08:00
Zach Fox
fada02a76c
Merge pull request #11864 from zfox23/commerce_newHelpText 
New Help questions/answers/link
 2017-11-22 12:53:16 -05:00
Zach Fox
d2ebfbf064 New Help questions/answers/link 2017-11-21 18:55:48 -05:00
Zach Fox
d31578abae FIXME LATER! Remove mouseareas from passphrase screens 2017-11-17 15:47:02 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
Zach Fox
ec16f16757 Remove debug buttons from wallet 2017-11-17 15:21:18 -08:00
Zach Fox
f570e3c874 Fix 'My Items' display 2017-11-17 11:27:00 -08:00
Zach Fox
7f64ede940 Fix skipping wallet setup step in certain cases 2017-11-16 11:44:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Zach Fox
e8c4878c8f Fix rezzing non-JSON marketplace items 2017-11-15 11:25:18 -08:00
Zach Fox
f5994375cf Remove Marketplace's dependency on Edit.js for rez 2017-11-14 14:29:49 -08:00
Zach Fox
5290ee3b4e Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist 2017-11-14 10:07:44 -08:00
Zach Fox
a3332e15b7 Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist 2017-11-13 15:01:26 -08:00
Zach Fox
641c4656c4 Fix bug with disappearing certificate info 2017-11-13 10:53:16 -08:00
Zach Fox
38fde43009 ...simplify your life 2017-11-08 13:19:47 -08:00
Zach Fox
3190fe1f32 Use keyfilepath instead of cached public keys 2017-11-08 12:30:48 -08:00
Zach Fox
72fa0823ba Logic changes 2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc Frontend changes 2017-11-08 10:25:11 -08:00
Zach Fox
f248eb5518 Change wallet home when 0 transactions 2017-11-07 11:30:09 -08:00
Zach Fox
149c8fbeb2 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-06 09:25:30 -08:00
Zach Fox
6f3c61c4e0 Slightly modify invalid cert language 2017-11-02 17:59:36 -07:00
Zach Fox
19945c5991 Update cert UI 2017-11-02 10:22:00 -07:00
Zach Fox
56cb98d96f Make inspection cert work 2017-11-01 12:02:57 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Zach Fox
9481824d0a Fix enabled status of wear button 2017-10-26 17:02:09 -07:00
Zach Fox
5898f0bd0c Gotta do some fancy stuff with anchors for this to work 2017-10-25 15:04:47 -07:00
Zach Fox
dafa830c0d First steps 2017-10-25 14:44:59 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 
2017-10-23: Merge RC57 into Master
 2017-10-24 21:19:01 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Dante Ruiz
92f765fe52 property set echomode for keyboard for wallet and webviews 2017-10-24 13:53:50 -07:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
Zach Fox
30bffdea32 Quick bugfix 2017-10-23 11:45:51 -07:00
Zach Fox
5c8451a626 Auto-refresh Wallet Home & Purchases on 4s timer 2017-10-23 10:36:23 -07:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Zach Fox
dc1b3aef8f Don't show purchases tutorial if user clicks what is rez 2017-10-18 16:25:06 -07:00
Zach Fox
322bac035c Don't show 'no permission' text on wearables 2017-10-18 16:19:54 -07:00
Zach Fox
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -07:00
Zach Fox
91ac2ab58c LowerKeyboard button changes 2017-10-18 15:31:12 -07:00
Zach Fox
a993386613 Change color of 'Instructions Opened on Desktop' to disabled gray 2017-10-18 15:13:28 -07:00
Zach Fox
33508b6b2b Update help text 2017-10-18 14:55:45 -07:00
Zach Fox
e829bd2919 Fix 'Recent Activity' indentation 2017-10-18 14:47:14 -07:00
Zach Fox
6f5fafb62f Add 'showDebugButtons' switch on Help ta 2017-10-18 14:12:43 -07:00
Zach Fox
876001146a Get categories from backend instead of site 2017-10-18 14:05:47 -07:00
Zach Fox
de50eef9c7 Fix rez certified... 2017-10-18 13:54:46 -07:00
Zach Fox
949da17046 Wear It button for items with category 'Wearables' 2017-10-18 13:51:58 -07:00
Zach Fox
6b7c997a4c Minor text tweak 2017-10-13 13:37:11 -07:00
Zach Fox
051019a57a Fix certificate username text eliding too early 2017-10-13 12:10:37 -07:00
Zach Fox
95a9675220 Final help QA - minus link to blockchain docs 2017-10-13 10:58:15 -07:00
Zach Fox
3f0ec73be6 Fix date displays 2017-10-11 10:55:14 -07:00
Zach Fox
5e383e2b1c My Item certificates 2017-10-10 14:56:17 -07:00
Zach Fox
702528a8cc Fully integrate cert properties 2017-10-10 13:27: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
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Zach Fox
b81a8a95ea Final fixes 2017-10-09 15:23:22 -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
acdd1e32e4 First round 2017-10-09 12:11:07 -07:00
Zach Fox
0b600a74c3 Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout 2017-10-05 14:34:53 -07:00
Zach Fox
9290a51685 Fix confirmed text 2017-10-05 14:03:56 -07:00
Zach Fox
8e82095135 Number sold and limited run 2017-10-05 12:46:20 -07:00
Zach Fox
d605bd9ef4 Preprocess inventory endpoint result 2017-10-05 11:01:15 -07:00
Zach Fox
fcafbef109 Fix buying free items using Commerce system 2017-10-04 09:34:32 -07:00
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
1d1b846f39 Better 'view backup instructions' behavior 2017-10-02 12:44:51 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
vladest
9a00468ea9 semicolons, yes 2017-10-01 19:21:30 +02:00
vladest
feafd441b1 Make sure keyboard will be rised after lowering on another click 2017-10-01 18:54:07 +02:00
Zach Fox
e6ea76eefe Tiny language fix - Thanks Cain! 2017-09-29 15:44:44 -07:00
Zach Fox
4668294389 Fix login flow regression 2017-09-29 15:25:24 -07:00
Zach Fox
bbbce96407 Fix gray securityimage 2017-09-29 14:30:02 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
vladest
7f6773b1f4 Added semicolons 2017-09-29 21:12:21 +02:00
vladest
01a0b26b90 Remove mouse area for text fields. use activeFocusOnPress property instead 2017-09-29 17:14:35 +02:00
Zach Fox
a1ae13489e Slight changes to tutorial 2017-09-28 16:41:29 -07:00
Zach Fox
2cff5c1fa6 First time Purchases tutorial 2017-09-28 15:12:55 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
Zach Fox
3a537cdcc3 Make usernameDropdown collapse when clicking anywhere outside it 2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3 Fix keyboard focus during setup while tip is up 2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761 styling updates for purchases 2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae Update Purchases 2017-09-28 12:49:38 -07:00
Zach Fox
8d74487393 Use edition number; fix CONFIRMED timer 2017-09-28 10:25:05 -07:00
Zach Fox
60823903cf You own X others 2017-09-27 17:05:07 -07:00
Zach Fox
7b7e0bc78b Updated Recent Activity 2017-09-27 16:35:35 -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
1903f65e45 oops 2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -07:00
David Kelly
99cdbbe306 and lets fix the purchases flow too 2017-09-08 14:00:09 -07:00
David Kelly
45c8dd9dd4 cr feedback 2017-09-08 05:28:41 -07:00
David Kelly
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
David Kelly
89cda8d306 oops -- === not == 2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f fix passphrase reset 2017-09-05 17:03:11 -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
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
Zach Fox
51699c9a6a Minor changes to fonts and colors 2017-09-01 11:44:46 -07:00
Zach Fox
8fcdfa171d Add debug button to clear passphrase 2017-08-31 16:51:39 -07:00
Zach Fox
1bfc767daf Quick fixes 2017-08-31 16:42:14 -07:00