Commit graph

100 commits

Author SHA1 Message Date
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
Kalila L
d3a97832a3 Update the rest of non /script-archive/ script URLs. 2020-09-21 00:14:22 -04:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
Roxanne Skelly
0fdbca8ade QmlMarketplace Bugfixes
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
2019-01-29 16:07:27 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace
Checkpoint full functionality
2019-01-24 17:20:42 -08:00
Wayne Chen
c36b3a4b07 fix 2018-12-19 12:46:41 -08:00
Wayne Chen
0a0b7bf1ad removing onUsernameChanged signal to alter login settings 2018-12-12 16:26:35 -08:00
Zach Fox
75ba1cb3c7 I forgot to clear dot immediately 2018-12-11 10:30:12 -08:00
Zach Fox
ab6aeae91a Fix MS20161: Fix INVENTORY notification dot state 2018-12-10 13:01:28 -08:00
Zach Fox
051b7cfbb8 Fix MS20117: Prevent HTML link from appearing in Wallet notification 2018-11-30 16:12:21 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Howard Stearns
89656ea3f6 activity notifications also change ASSETS to INVENTORY 2018-11-05 16:43:06 -08:00
Zach Fox
f10b9ae30c Squashed commit of the following:
commit 515ff016a4
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 13:03:34 2018 -0800

    Fix seven bugs

commit a4d36b3845
Merge: 8906b909eb d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 10:25:58 2018 -0800

    Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce

commit d0181283dd
Merge: be17ed0910 643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date:   Fri Nov 2 16:44:31 2018 -0700

    Merge pull request #14308 from sabrina-shanman/fbx2hfm

    (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes

commit 643026abd6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:15:30 2018 -0700

    Change local variable in TestFbx for clarity

commit 0b7ddca5f6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:03:20 2018 -0700

    Change naming for straggler names in model loading debug dumps

commit becee7f010
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Tue Oct 30 17:28:42 2018 -0700

    Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-05 13:12:43 -08:00
howard-stearns
7115f0e688 update notification refs inventory, not assets 2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e Merge branch 'oculus-store-commerce' into tabless 2018-11-04 12:17:21 -08:00
howard-stearns
8906b909eb close wallet app during login so that it doesn't tell to login after
login
2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9 remove wallet reference in update notification 2018-11-04 11:25:40 -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
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Howard Stearns
8f2f27f468 Merge branch 'oculus-store-commerce' into tabless 2018-11-01 11:22:28 -07:00
Zach Fox
d481f081bb Fix four bugs; truncate some logs 2018-11-01 10:29:38 -07:00
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28 tabless wallet 2018-10-31 13:58:26 -07:00
Zach Fox
a1276ba899 Don't poll for history notifs if limitedCommerce is true 2018-10-31 13:31:29 -07:00
Zach Fox
448be8847f Notifications are working! 2018-10-31 13:23:58 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
Howard Stearns
6284c902be use the switch 2018-10-25 11:29:10 -07:00
Howard Stearns
1ff50bc05e updates notification applies to assets, and there is no wallet activity
notification
2018-10-24 12:45:17 -07:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00
Zach Fox
9a21354c27 Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps 2018-09-26 15:08:20 -07:00
Zach Fox
6877af04f1 Fix GOTO notifs; fix WALLET notifs (pending backend change) 2018-09-26 14:57:32 -07:00
Kerry Ivan Kurian
28ec98be9e Uninstall marketplace item tester on wallet shutdown 2018-09-25 19:24:46 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
Zach Fox
1ac2800e18 Fix wallet dot logic 2018-09-24 17:50:37 -07:00
Zach Fox
a76c3f028d Small bugfixes 2018-09-24 14:46:00 -07:00
Zach Fox
33c04631ea Comments on Confluence doc 2018-09-20 14:37:46 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Zach Fox
4987164706 Notifications for GOTO (using a cool algorithm) 2018-09-18 15:30:43 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Zach Fox
a97f9eb79a Logic for Wallet notifications; some bugfixes 2018-09-18 12:28:03 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Zach Fox
5a1d074e2f Goto now uses AppUi; lint 2018-09-12 16:04:37 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -07:00