Zach Fox
f10f9aa939
Continued progress
2018-03-05 10:01:40 -08:00
Zach Fox
f53aba2a32
Initial progress
2018-03-02 15:53:06 -08:00
Alexander Ivash
f9de255fa7
FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials
2018-02-23 20:07:09 +03:00
Zach Fox
f14673bc50
Fixup Checkout for apps
2018-02-22 16:38:38 -08:00
Zach Fox
4d2d7fa51f
lots of fun initial progress!
2018-02-22 13:56:46 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
Zach Fox
b548567f5a
Apps protection
2018-02-21 11:17:47 -08:00
Zach Fox
f08c66e3ac
Remove debug code
2018-02-20 14:16:55 -08:00
Zach Fox
11f897beb0
Initial app support
2018-02-20 10:39:36 -08:00
Zach Fox
811ecf9db8
Fix
2018-02-15 14:44:33 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
David Rowe
b1f49be790
Merge branch 'master' into 21742
...
# Conflicts:
# scripts/system/libraries/entitySelectionTool.js
2018-02-13 10:04:32 +13:00
Zach Fox
ffea8104fc
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-09 15:59:38 -08:00
Zach Fox
abdd50fb45
it's a start
2018-02-09 15:56:28 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
John Conklin II
40851b097f
Merge pull request #12324 from ElderOrb/FB11844
...
Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace
2018-02-07 14:31:20 -08:00
David Rowe
adb6f66a05
Handle tablet entities and overlays not being available
2018-02-08 09:51:48 +13:00
Alexander Ivash
151f20a92f
define onWalletScreen in this marketplaces.js scope
2018-02-06 21:25:41 +03:00
Alexander Ivash
46bace97cf
FB11844 - Disable Preview enabled some time after unchecking the Display >Disable Preview option.
2018-02-02 19:08:50 +03:00
Zach Fox
89e52561e3
Silly bugfix
2018-02-01 11:56:54 -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
5469025113
More more more
2018-01-09 15:53:25 -08:00
Alexander Ivash
7e87cb38e1
adjusted code to PR comments
2018-01-09 11:10:23 +03:00
Alexander Ivash
9a63fc94f0
5648 play audio notification to confirm purchase upon rezzing
2018-01-08 21:14:44 +03:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -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
5da49d156e
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-19 16:26:58 -08:00
Seth Alves
2cd64ccd2c
merge from upstream
2017-12-11 10:14:30 -08:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
Zach Fox
a99072622a
Fix Create mode :|
2017-12-08 15:41:47 -08:00
Zach Fox
be737af79d
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies
2017-12-08 14:08:35 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Seth Alves
4659d22021
work around a crash when closing CREATE
2017-12-07 21:32:18 -08:00
Seth Alves
c4b2422f53
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 19:40:52 -08:00
MandatoryMania
f1808ee126
Merge pull request #11943 from MandatoryMania/returnToMarketplace
...
return to main mktplace page from rez page
2017-12-07 19:14:37 -08:00
H Q
72ed3b077d
Addressed PR change requests
2017-12-07 11:28:40 -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
Seth Alves
86f58c1353
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 08:50:50 -08:00
H Q
ed76ca8018
return to main mktplace page from rez page
2017-12-06 15:37:19 -08:00
Zach Fox
5f3b148baa
Fix marketplace icon incorrectly appearing active
2017-12-06 13:01:23 -08:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -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
Seth Alves
3642d6cfdf
fix includes
2017-12-05 11:26:36 -08:00
Seth Alves
c4e5c53eee
jshint cleanups
2017-12-05 11:17:31 -08:00
Seth Alves
5b908dbf51
import zach's edit.js dependency fixes
2017-12-05 11:14:59 -08:00
Seth Alves
26cb275b89
adjust wearables with saved offsets after WEAR IT
2017-12-05 11:11:56 -08:00
Zach Fox
5261434b6a
Further remove dependencies of marketplaces.js on edit.js
2017-12-04 09:45:36 -08:00
Zach Fox
f47f259816
Turn Commerce on by default
2017-11-17 15:12:49 -08:00
Zach Fox
93c3d53144
Fix marketplaces.js URLs
2017-11-15 16:46:00 -08:00
Brad Davis
bb2e061d77
Fixing global declarations in JS
2017-11-15 12:00: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
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Zach Fox
d6c244d1d5
Remove incorrect logic
2017-11-14 14:54:03 -08:00
Zach Fox
f5994375cf
Remove Marketplace's dependency on Edit.js for rez
2017-11-14 14:29:49 -08:00
Brad Davis
69029b49f3
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 14:29:49 -08:00
Zach Fox
641c4656c4
Fix bug with disappearing certificate info
2017-11-13 10:53:16 -08:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
Zach Fox
3f0108528d
Remove unnecessary newline
2017-10-25 15:19:56 -07:00
Zach Fox
14150c09ac
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-25 12:59:36 -07:00
Zach Fox
7998984d8e
Missed tons of spots!
2017-10-24 14:30:47 -07:00
Zach Fox
4b50454104
Missed a spot
2017-10-24 14:13:14 -07:00
Zach Fox
ae1b2bd931
'Tis a silly hack
2017-10-20 11:11:23 -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
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
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Zach Fox
11d0062104
Progress on buy endpoint
2017-10-02 16:57:41 -07:00
Zach Fox
1050d2851d
Modify injected code to add to dropdown menu
2017-10-02 12:37:49 -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
1e52e7824b
Fix injection
2017-09-29 16:39:07 -07:00
Zach Fox
255cede808
Correctly determine if we're on a marketplace screen
2017-09-29 16:05:26 -07:00
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -07:00
Zach Fox
66be558a04
My Items Interface
2017-09-28 14:04:57 -07:00
Zach Fox
68c08969ae
Update Purchases
2017-09-28 12:49:38 -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
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
Zach Fox
fa25c434ca
Messages to marketplaces.js
2017-08-31 15:50:42 -07:00
Zach Fox
ce32d2d420
Checkout and Purchases
2017-08-31 14:12:05 -07:00
Zach Fox
f366743be7
Login; punctuationMode; new images
2017-08-30 11:07:03 -07:00
Zach Fox
a9c99854f9
Haven't purchased anything yet UI
2017-08-29 15:39:07 -07:00
Zach Fox
a03f9592c1
Inventory to Purchases
2017-08-25 16:34:48 -07:00
Zach Fox
d19377d2d4
Saving
2017-08-25 15:56:30 -07:00
Zach Fox
e2c74d8b88
Initial progress
2017-08-24 15:22:30 -07:00
Zach Fox
b7282cc776
Lots of fixes
2017-08-15 13:46:20 -07:00
Zach Fox
bddce9328b
V1
2017-08-15 11:08:03 -07:00
Zach Fox
c38837c200
Remove fixmes
2017-08-11 16:21:39 -07:00
Zach Fox
a21ff75a49
Big progress!
2017-08-11 12:54:55 -07:00
Zach Fox
080c6da71a
Get HFC balance from QmlCommerce API
2017-08-11 10:49:11 -07:00
Zach Fox
e1064938cd
Add inventory; also fix some bugs
2017-08-11 10:31:32 -07:00
howard-stearns
ca13d58b0b
blance and inventory stubs
2017-08-10 12:44:50 -07:00
Zach Fox
2d256a62a9
Fix marketplaces message passing
2017-08-09 17:04:36 -07:00
Zach Fox
65f9b0052f
Working buy button
2017-08-09 13:59:21 -07:00
Howard Stearns
cc634a2d1b
Merge pull request #11148 from zfox23/commerce_singleSetting
...
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
2017-08-09 13:25:10 -07:00
howard-stearns
1cf81495ab
basic commerce infrastructure
2017-08-09 11:50:52 -07:00
