David Kelly
|
a9fc63da4c
|
fix error when pending
|
2018-01-16 15:04:05 -08:00 |
|
David Kelly
|
d8f8f9ff1a
|
First cut at alan's new design
|
2018-01-16 11:19:10 -08:00 |
|
David Kelly
|
579a4d85b3
|
Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory
|
2018-01-12 14:37:46 -07:00 |
|
Zach Fox
|
b7f4fe2ba3
|
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file
Do not delete wallet file
|
2018-01-12 09:44:40 -08:00 |
|
Zach Fox
|
c216144015
|
Remove unnecessary comments
|
2018-01-11 16:21:59 -08:00 |
|
Zach Fox
|
464bbe5d43
|
Bugfixes, refactoring, and improvements
|
2018-01-11 15:26:51 -08:00 |
|
Zach Fox
|
1e608b13b2
|
Show username when admin (this probably isn't the way to get username
|
2018-01-11 14:45:43 -08:00 |
|
vladest
|
cff80e86b6
|
Temporarily disable magnification until further notice
|
2018-01-11 22:18:22 +01:00 |
|
Zach Fox
|
df58065e75
|
Silly bug
|
2018-01-11 13:02:00 -08:00 |
|
Zach Fox
|
d25ef074e1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-11 12:35:18 -08:00 |
|
howard-stearns
|
c39771d995
|
do not delete wallet file when things go wrong, and remove obsolete
reset machinery
|
2018-01-11 11:50:23 -08:00 |
|
Zach Fox
|
d577b2e9e8
|
Actually add the API calls
|
2018-01-11 11:45:43 -08:00 |
|
Anthony Thibault
|
8d5e7dbeff
|
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:58:10 -08:00 |
|
Seth Alves
|
363b9bfe11
|
Merge pull request #12127 from SamGondelman/freeze
Comment out TabletAddressDialog logging of long messages
|
2018-01-10 18:07:18 -08:00 |
|
Zach Fox
|
939012a2d0
|
Hook up the endpoints!
|
2018-01-10 17:10:05 -08:00 |
|
Zach Fox
|
0d137d62c8
|
HMD tweaks
|
2018-01-10 16:37:47 -08:00 |
|
Anthony J. Thibault
|
1deb75daf7
|
Fix for black screen when clicking Settings from Snap app
(cherry picked from commit d5e3b97c93 )
|
2018-01-10 16:31:51 -08:00 |
|
Zach Fox
|
b3e3af4ee7
|
Add character count :)
|
2018-01-10 16:23:29 -08:00 |
|
Zach Fox
|
260aee42a8
|
Improvements
|
2018-01-10 16:18:34 -08:00 |
|
Zach Fox
|
c15b1669b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-10 15:53:23 -08:00 |
|
Zach Fox
|
93b15c0aa6
|
Payment Failure
|
2018-01-10 15:53:13 -08:00 |
|
Zach Fox
|
6812010660
|
The skeleton is there
|
2018-01-10 15:33:18 -08:00 |
|
Zach Fox
|
22631065e4
|
Serious flow state
|
2018-01-10 15:09:15 -08:00 |
|
Zach Fox
|
c5a5bddbc9
|
More progress
|
2018-01-10 12:21:12 -08:00 |
|
Zach Fox
|
e5abdc77d9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-10 10:02:56 -08:00 |
|
Howard Stearns
|
fafc98f51c
|
Merge pull request #12098 from ElderOrb/FB11123
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
|
2018-01-10 10:01:15 -08:00 |
|
Zach Fox
|
f366fdf695
|
Beginnings of nearby
|
2018-01-10 09:58:23 -08:00 |
|
Zach Fox
|
928e3d2ef7
|
Merge pull request #12108 from zfox23/commerce_pagination
Commerce: Support pagination at History endpoint; improve Purchases scrolling
|
2018-01-09 15:57:34 -08:00 |
|
Zach Fox
|
5469025113
|
More more more
|
2018-01-09 15:53:25 -08:00 |
|
Zach Fox
|
530df5447d
|
Even more proress
|
2018-01-09 15:19:50 -08:00 |
|
SamGondelman
|
a42b0cf485
|
comment out logging
|
2018-01-09 14:58:23 -08:00 |
|
Zach Fox
|
40a3f8b31b
|
Progress
|
2018-01-09 14:13:36 -08:00 |
|
Melissa Brown
|
19802b33eb
|
Merge pull request #12109 from vladest/tablet_page_indicator
Page indicator visible only when pages more than one
|
2018-01-09 14:05:32 -08:00 |
|
Zach Fox
|
a6259a5ef5
|
Initial progress
|
2018-01-09 13:39:28 -08:00 |
|
Seth Alves
|
87dfe0efc3
|
Merge pull request #12097 from vladest/tablet_pagination_magnify
Tablet pagination magnify
|
2018-01-09 08:08:02 -08:00 |
|
Alexander Ivash
|
0f6b93eaea
|
FB11123 Make the certificate GOLD (and change title to Proof of Provenance License)
|
2018-01-09 03:13:31 +03:00 |
|
vladest
|
891663bae9
|
Page indicator visible only when pages more than one
|
2018-01-08 23:07:09 +01:00 |
|
Zach Fox
|
611f25d542
|
Improve scrolling thru My Purchases
|
2018-01-08 13:17:04 -08:00 |
|
Zach Fox
|
dcfceab078
|
Remove all work done on paginating purchases
|
2018-01-08 12:03:56 -08:00 |
|
Zach Fox
|
2231bf2bdd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination
|
2018-01-08 11:45:20 -08:00 |
|
Zach Fox
|
cdd62c7119
|
I don't think auto-refresh and pagination of inventory is possible
|
2018-01-08 11:29:41 -08:00 |
|
Zach Fox
|
99510f522d
|
Merge pull request #12095 from ElderOrb/FB10621
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
|
2018-01-08 10:05:53 -08:00 |
|
Howard Stearns
|
724db93389
|
Merge pull request #12002 from howard-stearns/consistent-goToUser
Consistent go to user
|
2018-01-07 11:07:39 -08:00 |
|
vladest
|
02972c92f0
|
Merge branch 'master' into tablet_pagination_magnify
|
2018-01-05 19:12:13 +01:00 |
|
Seth Alves
|
2071d42d25
|
Merge pull request #12088 from ElderOrb/FB11008
11008 GoTo app does not focus on address bar when opened
|
2018-01-05 10:07:36 -08:00 |
|
Andrew Meadows
|
c33c637f07
|
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
|
2018-01-05 09:07:54 -08:00 |
|
Seth Alves
|
fd8b521c50
|
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
|
2018-01-05 08:15:48 -08:00 |
|
Alexander Ivash
|
437b78dce5
|
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
|
2018-01-05 13:35:19 +03:00 |
|
Zach Fox
|
4612ef3d7c
|
Use atYBeginning
|
2018-01-04 15:41:01 -08:00 |
|
vladest
|
67ca76baa1
|
Magninfication
|
2018-01-04 23:11:42 +01:00 |
|