Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 11:48:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

209 commits

Author SHA1 Message Date
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
5563edd957 Focus fix; Switch to QQC2 2018-03-13 13:11:59 -07:00
Zach Fox
50e709c738 Add updates; drop shadow 2018-03-13 12:13:14 -07:00
Zach Fox
bce7fb1ff1 Improvements 2018-03-12 16:54:10 -07:00
Zach Fox
9c7d857ecb Fix some focus issues 2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da It's working! 2018-03-12 15:54:11 -07:00
Zach Fox
db7eea543e Initial progress 2018-03-12 15:11:09 -07:00
Zach Fox
0285bf9379 purposeful incorrect indentation to prevent insane diff 2018-03-07 13:27:40 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
Zach Fox
b764a4d404 Filter out invalid purchases 2018-03-07 09:22:57 -08:00
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -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
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
vladest
531c4dc41d Merge branch 'master' into move_to_qqc2 2018-02-28 11:40:46 +01:00
vladest
6a5fe0d513 Merge branch 'master' into move_to_qqc2 2018-02-27 15:23:52 +01:00
howard-stearns
4e4aebc7ee get WalletChoice setup flow from My Purchases and confirmation. Still 
not correct referrer.
 2018-02-26 12:02:56 -08:00
howard-stearns
30a6cca4b3 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 09:26:09 -08:00
vladest
b1070f85f0 Merge branch 'master' into move_to_qqc2 2018-02-24 02:59:40 +01: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
33f73fef0d YAY! 2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346 It's working! 2018-02-22 16:09:01 -08:00
Zach Fox
de0eee52d6 cool 2018-02-22 14:45:32 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
Zach Fox
74655bde49 Fix skeletonmodelURLchanged signal 2018-02-21 12:12:20 -08:00
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Zach Fox
1fbc16aae2 Fix noPermissionGlyph margin 2018-02-21 10:52:17 -08:00
Zach Fox
f08c66e3ac Remove debug code 2018-02-20 14:16:55 -08:00
Zach Fox
c4e9c76258 Small UIT tweaks 2018-02-15 16:03:49 -08:00
Zach Fox
811ecf9db8 Fix 2018-02-15 14:44:33 -08:00
Zach Fox
8072372822 Lots of changes 2018-02-15 13:27:13 -08:00
Zach Fox
b8fb08dc74 Avatar support 2018-02-15 11:24:22 -08:00
Zach Fox
5a8b8d4ac8 Lots of changes 2018-02-14 16:44:02 -08:00
Zach Fox
a477a3da70 Done with My Purchases flow for now 2018-02-13 15:04:31 -08:00
vladest
e8959b4cc0 Merge branch 'master' into move_to_qqc2 2018-02-13 22:01:16 +01:00
Zach Fox
0809210dc3 No permission card 2018-02-13 11:16:48 -08:00
Zach Fox
95e9eb8e4a Lots of progress 2018-02-12 17:06:57 -08:00
Zach Fox
abdd50fb45 it's a start 2018-02-09 15:56:28 -08:00
Zach Fox
19235b8d94 Fix a bug where hover events incorrectly propagate under popups 2018-02-02 10:50:35 -08:00
vladest
1c63bcf02e Merge branch 'master' into move_to_qqc2 2018-01-31 22:13:52 +01:00
Zach Fox
afc71a5ac5 Fix Purchases sorting (again); Fix (i) icon loading 2018-01-25 12:17:34 -08:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
vladest
04d45be0a9 Merge branch 'master' into move_to_qqc2 2018-01-10 21:21:03 +01:00
Zach Fox
611f25d542 Improve scrolling thru My Purchases 2018-01-08 13:17:04 -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
10d494b51d Pagination for Recent Activity 2018-01-04 12:32:30 -08:00
vladest
2fbd0a41b1 Move Slider 2017-12-28 15:39:22 +01: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
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -08:00
vladest
2770650b65 Merge branch 'master' into move_to_qqc2 2017-12-12 18:48:41 +01: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
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Zach Fox
4334bf8222 Add data tracking for purchase and rez 2017-12-05 13:09:09 -08:00
vladest
f2d7e2f607 Merge branch 'master' into move_to_qqc2 2017-12-02 22:41:19 +01: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
vladest
c8d864465f Merge branch 'master' into move_to_qqc2 2017-11-18 18:54:08 +01: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
f570e3c874 Fix 'My Items' display 2017-11-17 11:27:00 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
vladest
0e53afc346 Merge branch 'master' into move_to_qqc2 2017-11-15 20:53:14 +01:00
Zach Fox
f5994375cf Remove Marketplace's dependency on Edit.js for rez 2017-11-14 14:29:49 -08:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
Zach Fox
dafa830c0d First steps 2017-10-25 14:44:59 -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
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -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
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
acdd1e32e4 First round 2017-10-09 12:11:07 -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
4668294389 Fix login flow regression 2017-09-29 15:25:24 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07: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
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
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
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
Zach Fox
0a9e3e8967 Remove unnecessary code 2017-08-31 15:46:37 -07:00
Zach Fox
2c2500875f Fixes and improvements 2017-08-31 15:39:58 -07:00
Zach Fox
eab2947d40 Auth flow 2017-08-31 15:16:29 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
Zach Fox
7a7d7f95d7 Polish transaction history and prepare for whatever new design 2017-08-30 12:45:13 -07:00
Zach Fox
fb4b0f60fa Remove most dependencies on 'onVisibleChanged' 2017-08-30 11:55:29 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
6ee634b90a Lock overlay on top of security image 2017-08-29 17:19:34 -07:00
Zach Fox
5d1170c5d6 Only make message appear after inventory received 2017-08-29 16:17:59 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Zach Fox
37b6099f36 Hook up root_file_url 2017-08-28 12:46:01 -07:00
Zach Fox
1c1b841a86 Fix security images; actually do the right thing when wallet not set up 2017-08-28 12:18:53 -07:00
Zach Fox
ceb38e261d HMD Keyboard for purchases filterBar 2017-08-28 10:45:08 -07:00
Zach Fox
e293d122b1 Add security image to Checkout and Purchases 2017-08-28 09:33:30 -07:00
Zach Fox
50f7f91d4e Close the loop. 2017-08-25 16:49:02 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00