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
7b7e0bc78b
Updated Recent Activity
2017-09-27 16:35:35 -07:00
Atlante45
eb06c33187
Naming coding standard fix
2017-09-27 15:32:53 -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
Atlante45
73483eef94
Update information sentence
2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a
Fix tablet asset browser
2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a
Re-sync files
2017-09-26 18:42:50 -07:00
Atlante45
dda715e171
Update TabletAssetServer
2017-09-26 18:25:20 -07:00
Atlante45
acb0bf8d20
Asset Browser tweaks
2017-09-26 17:26:46 -07:00
Andrew Meadows
909e5e86b1
Merge pull request #11442 from vladest/fix_dde_visibility
...
Fix dde visibility
2017-09-26 14:19:47 -07:00
Ryan Huffman
883bdc6003
Merge pull request #11425 from Atlante45/feat/auto-bake
...
Asset Browser auto-refresh
2017-09-22 13:17:04 -07:00
vladest
5aab9bf5b0
Merge branch 'master' into fix_dde_visibility
2017-09-22 21:10:21 +02:00
vladest
4d530ef173
Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close
2017-09-22 21:08:34 +02:00
Atlante45
6cdbf0c44a
Fix RunningScripts in tablet mode
2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991
Add Asset Server auto refresh
2017-09-21 14:41:59 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
vladest
c48aba423a
Rename check box
2017-09-20 22:48:39 +02:00
vladest
7a36894f76
Make sure audio device not gets unchecked
2017-09-19 23:25:41 +02:00
vladest
10f7f08171
Added peak model, missed during merging
2017-09-19 21:42:52 +02:00
vladest
6297448e90
Build fix
2017-09-19 19:49:19 +02:00
vladest
6c32783a09
Merge branch 'master' into audio_devices_split
2017-09-19 17:43:03 +02:00
beholder
353bab5277
7384 On Domains without Edit Access, Create Button Text still Highlights
...
(override color in states if captionColorOverride was specified)
2017-09-16 16:50:45 +03:00
Atlante45
a37642ba44
Pull Auto-Baking changes to TabletAssetServer.qml
2017-09-15 14:43:15 -07:00
Atlante45
c4d018504b
Pull Auto-Baking changes to TabletAssetServer.qml
2017-09-15 13:28:51 -07:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
Atlante45
8711823a9b
Sync up AssetServer.qml and TabletAssetServer.qml
2017-09-15 11:44:08 -07:00
Atlante45
ae14f1f88e
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-09-14 15:34:20 -07:00
Seth Alves
10494cf3e0
Merge pull request #11359 from vladest/fix_runningscripts_selection
...
use selection model of TreeView
2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e
Merge pull request #11310 from ElderOrb/case6718
...
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
2017-09-14 11:17:48 -07:00
vladest
7233c47257
use selection model of TreeView
2017-09-14 15:36:12 +02:00
Atlante45
2e84f48539
Fix QML errors
2017-09-13 09:54:55 -07:00
David Kelly
1903f65e45
oops
2017-09-08 16:58:12 -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
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4
cr feedback
2017-09-08 05:28:41 -07:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Howard Stearns
a0ae9ee747
Merge pull request #11311 from davidkelly/dk/walletCleanup
...
wallet cleanup
2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58
Merge pull request #11298 from ElderOrb/case7382
...
7382 Create Menu does not Work on Tablet
2017-09-06 14:09:41 -07:00
vladest
e17f05a337
Correct UI
2017-09-06 14:52:08 +02:00
vladest
57643bd904
Merge branch 'master' into audio_devices_split
2017-09-06 14:20:41 +02:00
David Kelly
89cda8d306
oops -- === not ==
2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
beholder
41d014ca0c
6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.
2017-09-06 02:11:40 +03:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -07:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
David Kelly
90316e275a
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
2017-09-01 13:33:23 -07:00
David Kelly
9fe6ce0337
working change passphrase. some cleanup to come
2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a
Minor changes to fonts and colors
2017-09-01 11:44:46 -07:00
Zach Fox
8fcdfa171d
Add debug button to clear passphrase
2017-08-31 16:51:39 -07:00
Zach Fox
1bfc767daf
Quick fixes
2017-08-31 16:42:14 -07:00
Zach Fox
fa25c434ca
Messages to marketplaces.js
2017-08-31 15:50:42 -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
David Kelly
cdadaa8c9c
missed one
2017-08-31 13:41:53 -07:00
David Kelly
de2ce1cd5f
warning
2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39
Changes in what I think are the right direction
2017-08-31 13:16:10 -07:00
druiz17
98b1fe6138
Merge pull request #11266 from ElderOrb/case6819
...
6819 - Create button not disabled
2017-08-31 12:36:08 -07:00
Zach Fox
914a6bae00
Commerce: Wallet Passphrase Modal
2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8
display hfc in "pennies"
2017-08-31 12:10:12 -07:00
David Kelly
962d1fc81d
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet
2017-08-30 15:30:29 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
vladest
b547b2573e
Added logged in property
2017-08-30 23:15:39 +02:00
Zach Fox
17d999e721
Fixes
2017-08-30 13:25:34 -07:00
vladest
903036a709
Merge branch 'master' into tablet_login_button
2017-08-30 22:12:03 +02:00
Zach Fox
580865fa5a
Add skeleton for infinite scroll
2017-08-30 12:54:26 -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
howard-stearns
b8da08ca42
reset wallet
2017-08-30 11:29:43 -07:00
Zach Fox
f366743be7
Login; punctuationMode; new images
2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f
Merge pull request #11267 from zfox23/commerce_zachsPunchlist1
...
Commerce: Zachs Punchlist 01
2017-08-30 10:10:56 -07:00
Zach Fox
6ee634b90a
Lock overlay on top of security image
2017-08-29 17:19:34 -07:00
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -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
c7ad875485
Virtual keyboard and logic
2017-08-29 15:27:53 -07:00
Zach Fox
50241078ae
Buncha punchlist items checked off
2017-08-29 14:30:00 -07:00
beholder
180acbc188
6819 - Create button not disabled
2017-08-29 23:49:44 +03:00
beholder
a0a43ebf26
show checkbox or radiobutton dependently on exclusiveGroup presence
2017-08-29 23:23:16 +03:00
David Kelly
84126d8f95
cr feedback
2017-08-29 08:46:13 -07:00
David Kelly
67f25adac0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-29 08:02:53 -07:00
David Kelly
a7af114144
fix wallet, use text from server in history (for now)
2017-08-28 17:04:19 -07:00
Zach Fox
22d3857501
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory
2017-08-28 15:10:17 -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
Atlante45
ca62e7168c
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-28 11:41:23 -07:00
Zach Fox
ceb38e261d
HMD Keyboard for purchases filterBar
2017-08-28 10:45:08 -07:00
David Kelly
3955624e63
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-28 10:13:21 -07:00
Zach Fox
ea00668725
Again to Another
2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027
Remove quantity
2017-08-28 09:58:45 -07:00
Zach Fox
52cb1dd893
Correctly handle non-JSON items
2017-08-28 09:54:51 -07:00
