Commit graph

346 commits

Author SHA1 Message Date
Alexander Ivash
f9de255fa7 FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials 2018-02-23 20:07:09 +03:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -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
fd6f4b569f Fix active focus issue 2018-02-20 13:19:31 -08:00
Zach Fox
eb29bdf5d2 Don't allow tabs or newlines 2018-02-20 13:06:10 -08:00
Zach Fox
2daa30f125 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-20 12:41:12 -08:00
Zach Fox
9bde9f5a4f Fix height of Optional Message in Send Money 2018-02-20 12:36:11 -08:00
Zach Fox
11f897beb0 Initial app support 2018-02-20 10:39:36 -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
0fca843667 Integrate 'alreadyOwned' endpoint 2018-02-14 10:24:34 -08:00
Zach Fox
a477a3da70 Done with My Purchases flow for now 2018-02-13 15:04:31 -08:00
Zach Fox
3e41229e8c Commerce: Fix wrap mode for very long P2P memos 2018-02-13 13:30:17 -08: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
ffea8104fc Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-09 15:59:38 -08:00
Zach Fox
abdd50fb45 it's a start 2018-02-09 15:56:28 -08:00
Zach Fox
a92e614aff Bugfix. 2018-02-08 10:35:34 -08:00
Zach Fox
e01e88d4ae This works, but is it correct? 2018-02-07 15:13:22 -08:00
Zach Fox
2270dcd79d Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
Commerce: Inspection Certificate Redesign
2018-02-07 13:52:20 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign" 2018-02-07 13:22:09 -08:00
Zach Fox
a40244b5d2
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
Commerce: Inspection Certificate Redesign
2018-02-07 10:19:30 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
Commerce: Send Money Nearby particle effect!
2018-02-02 14:17:48 -08:00
Zach Fox
f26477b3e1 Slight wording change to Optional Message placeholder 2018-02-02 11:00:32 -08:00
Zach Fox
19235b8d94 Fix a bug where hover events incorrectly propagate under popups 2018-02-02 10:50:35 -08:00
Zach Fox
dd2b7eb107 Send Money Effect & Lightbox 2018-02-01 15:17:50 -08:00
Zach Fox
fa69ea0352 Small comment addition 2018-02-01 13:57:05 -08:00
Zach Fox
ce79504f03 Fix checkbox 2018-02-01 11:51:08 -08:00
Zach Fox
bd26c9dfc0 More improvements 2018-02-01 09:36:41 -08:00
Zach Fox
14051bce0c This logic is insane 2018-01-31 17:20:20 -08:00
Zach Fox
fb5308e517 This logic is insane 2018-01-31 17:06:29 -08:00
Zach Fox
ab3a91a1da Oooooh it's so pretty 2018-01-31 16:53:23 -08:00
Zach Fox
90c2371f0c It's working! 2018-01-31 12:09:23 -08:00
Zach Fox
05fe33e417 Initial work 2018-01-30 18:01:46 -08:00
Zach Fox
d13d0e6ba2 Minor fixes 2018-01-30 14:30:50 -08:00
Zach Fox
b60a45d358 Inspection Certificate Redesign 2018-01-29 15:14:29 -08:00
Zach Fox
afc71a5ac5 Fix Purchases sorting (again); Fix (i) icon loading 2018-01-25 12:17:34 -08:00
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear
Fix security image index clear after back nav
2018-01-24 13:43:49 -08:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2
Commerce: Pixel-perfect "Send Money" UI
2018-01-22 09:39:23 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00