Zach Fox
b0ce3a54d5
Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash
2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff
Un-wear things when trashing them if worn
2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3
Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash
2018-12-19 15:03:36 -08:00
Zach Fox
116edcc224
I have no idea how this happened
2018-12-19 09:36:05 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing
2018-12-18 17:11:10 -08:00
Zach Fox
47a46c1d1b
Fix MS20308: Allow users to checkout uncertifiable items
2018-12-14 11:17:56 -08:00
Zach Fox
dff7804cdc
Change username to trashbot
2018-12-11 16:26:49 -08:00
Zach Fox
d74f7eb098
Implement MS20187: Add trash can feature to Inventory
2018-12-11 15:44:42 -08:00
Zach Fox
75ba1cb3c7
I forgot to clear dot immediately
2018-12-11 10:30:12 -08:00
Zach Fox
a2af50a9d0
Show pre-auth'd transactions in Recent Activity before redemption
2018-12-06 11:07:26 -08:00
Zach Fox
02307d2308
Secret to Coupon ID
2018-12-05 16:34:53 -08:00
Zach Fox
ab184c5c2b
Authorized Script to Coupon
2018-12-03 15:16:06 -08:00
Zach Fox
bc39dbba8b
Finish out the feature
2018-11-29 12:44:30 -08:00
Zach Fox
371c50b2ab
Start work on Pay Out UI
2018-11-28 11:01:40 -08:00
Zach Fox
a4175b0428
Error handling in checkout
2018-11-27 14:17:28 -08:00
Zach Fox
67dfccafec
Show item name when sending item
2018-11-27 10:19:14 -08:00
Zach Fox
a9fd443f28
'improve' UI slightly
2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8
Bugfixes; enable purchase asset from marketplace screen raise
2018-11-26 15:48:49 -08:00
Zach Fox
8df5db4239
Allow scripts to open SendAsset screen with pre-filled info
2018-11-26 13:26:17 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Howard Stearns
3431bdbb0e
new inventory icons, and align message waiting light in items tab
2018-11-12 14:51:32 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
Zach Fox
142dfab9ac
CR round 1
2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1
feedback changes
2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
...
Fix MS19743: Fix case where user couldn't update certain items
2018-11-07 14:57:35 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage"
2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505
Fix MS19743: Fix case where user couldn't update certain items
2018-11-06 15:47:47 -08:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Alexander Ivash
9623753416
change imports (how could I miss this place?)
2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244
cherry-picking
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
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-11-06 14:21:14 +05:30
Howard Stearns
335947598f
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless
2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df
My items to my submissions
2018-11-05 15:23:25 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -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
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Roxanne Skelly
a1eee351e9
Change "Proofs" to "My Submissions" in assets filter.
2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
