Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-25 21:29:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74087 commits 74 branches 59 tags 1.2 GiB
Commit graph

642 commits

Author SHA1 Message Date
Howard Stearns
e3b1e14db6 nix "buy" where possible. 2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247 nix the word "purchase" where possible 2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be use the switch 2018-10-25 11:29:10 -07:00
Howard Stearns
993cb0cfa0 restore separation of inventory vs proofs. 2018-10-24 12:00:17 -07:00
Howard Stearns
c1cb41875a Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-24 09:56:37 -07:00
Howard Stearns
7707d92a95 connect wiring on purchases 2018-10-23 16:07:35 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Zach Fox
f9cc4f5a69 Count unique source and url pairs 2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b Only show unique resources 2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
55c1a88404 Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2 2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-10-22 11:50:09 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap 
Fix MS18154: Don't snap to cards in My Purchases
 2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit 
make room for keyboard and help in SendAsset
 2018-10-18 17:53:52 -07:00
Kerry Ivan Kurian
d7d49ed84e Remove cruft 2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a Fix regression 2018-10-18 16:14:53 -07:00
Zach Fox
9f91238945 UX/UI improvements 2018-10-18 15:27:16 -07:00
Alexander Ivash
a4987e494a update imports 2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-10-18 21:05:20 +03:00
Kerry Ivan Kurian
89a5da80e0 Do not display incomplete metadata 2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
Howard Stearns
6c6d29152f new images for My Purchases rez tutorial 2018-10-11 12:36:43 -07:00
Howard Stearns
30971cd766 make room for keyboard and help in SendAsset 2018-10-10 15:43:20 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
Zach Fox
5b72e17981 Fix MS18154: Don't snap to cards in My Purchases 2018-09-28 11:33:22 -07:00
Kerry Ivan Kurian
440e2062f5 Fix application uninstall in marketplace item tester 2018-09-27 22:14:02 -07:00
Howard Stearns
75de305ec3 remove dead code 2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
Howard Stearns
da5f77afcd Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-26 15:26:52 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00
Howard Stearns
e1659ed520 fix old bad merge, and if told referrer while already setup, follow 
immediately
 2018-09-26 14:57:47 -07:00
Kerry Ivan Kurian
276125937c Eliminate double equals 2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian
4e7b03883f Use triple equals 2018-09-25 15:13:26 -07:00
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian
0a43c17ce0 Use entity-specific glyphs in marketplace item tester 2018-09-24 21:15:08 -07:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test 
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
 2018-09-24 16:30:49 -07:00
Kerry Ivan Kurian
f9c25f2f32 Allow user to select asset type in marketplace item tester 2018-09-20 16:36:06 -07:00
Kerry Ivan Kurian
c1cc031bd0 Remove cruft and refactor 2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian
afa8e44e66 Refactor 2018-09-20 10:53:32 -07:00
Howard Stearns
391128ef77 Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2 2018-09-19 16:46:09 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670 Switch to localhost before replacing content 2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian
38fd9523ee Attempt to load content set 
This does not result in the user seeing the content set.
 2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Kerry Ivan Kurian
cfa9d185f0 Add full resource paths to list in marketplace item tester 2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b Enable marketplace item test for avatar file 2018-09-18 13:25:01 -07:00
Kerry Ivan Kurian
645ad2bb7a Enable marketplace item test for avatar url 2018-09-18 12:36:03 -07:00
Kerry Ivan Kurian
8f5923d562 Show installed apps on start of marketplace item tester 
Also, refactor a bit.
 2018-09-18 11:23:32 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Zach Fox
68e6142f8b Follow wallet setup referrer when autogenerating new wallet 2018-09-14 15:34:00 -07:00
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588 Merge howard/wallet-locker2 into my branch 2018-08-23 14:45:16 -07:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -07:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
howard-stearns
0a47672d64 machinery for fetching next page of inifinite scroll before it really 
needed, and use in our infinite scrolls
 2018-07-18 13:00:03 -07:00
Zach Fox
919bfce7ab Simplify 2018-07-18 09:00:01 -07:00
Zach Fox
ef4265de4b Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button 2018-07-17 16:16:43 -07:00
Zach Fox
04f856019d Fix MS16701: Uninstall installed app before updating 2018-07-12 16:27:19 -07:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
Zach Fox
c95b359aa7 Fix MS16390: Correctly update UI when Buy endpoint fails 2018-07-02 10:23:53 -07:00
Howard Stearns
5fe7b874a4
Merge pull request #13455 from howard-stearns/test-wearables 
16089: test wearables for wear before gifting and wearing
 2018-06-25 16:44:53 -07:00
Zach Fox
3ceb9ddee9
Merge pull request #13444 from zfox23/MS16074_16076_banklinks 
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
 2018-06-25 13:47:08 -07:00
howard-stearns
43cba68cd2 test wearables for wear before gifting and wearing 2018-06-25 13:40:45 -07:00
Zach Fox
6fce6431a3 Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home 2018-06-22 16:09:49 -07:00
Zach Fox
25f22326a8 Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity 2018-06-22 15:43:16 -07:00
Zach Fox
ad1da3e225 Fix MS16012: Correct the criteria used to determine empty txn history 2018-06-18 14:26:46 -07:00
howard-stearns
020d622302 don't depend on matching handlers with overlapping requests 2018-06-09 17:34:49 -07:00
howard-stearns
421edbfa1e PSFListModel isa ListModel instead of hasa 2018-06-09 16:03:45 -07:00
howard-stearns
d68415c47c code feedback 2018-06-08 16:47:06 -07:00
howard-stearns
d9daa3495a remove comments / dead code 2018-06-08 15:36:10 -07:00
howard-stearns
3ade31bdf6 always show edition 2018-06-08 12:57:40 -07:00
howard-stearns
21ed081eae proper name for updated type filter of inventory endpoint 2018-06-08 09:52:11 -07:00
howard-stearns
64e466ee7d snapshot stacks 2018-06-07 21:10:40 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
howard-stearns
8b08505116 using filter/sort endpoint parameters 2018-06-07 16:14:18 -07:00
howard-stearns
8185d1b5f5 cleanup and consistently don't getNextPage at beginning 2018-06-06 15:24:54 -07:00
howard-stearns
335aeaeb38 purchases cleanup, wearables, and edition numbers when multiples seen. 2018-06-05 17:06:08 -07:00
howard-stearns
6aa551b35c Don't getNextPage when at beginning (even if that is also the end). 2018-06-05 17:04:29 -07:00
Zach Fox
c5ef5cfccb Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable 2018-06-04 16:13:18 -07:00
howard-stearns
29b09d64e6 checkpoint with PAL working. 2018-06-01 13:33:45 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
howard-stearns
17be460adf checkpoint 2018-05-25 16:37:06 -07:00
howard-stearns
d30d84f1bd checkpoint that has two ways to do filtering 2018-05-25 15:30:27 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
Zach Fox
bc590f556a Get first page 2018-05-16 14:43:43 -07:00
Zach Fox
97bb014734 Almost working for Purchases! 2018-05-16 13:20:23 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f It's working 2018-05-16 12:17:17 -07:00