Zach Fox
10d494b51d
Pagination for Recent Activity
2018-01-04 12:32:30 -08:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate
...
Tablet home paginate
2018-01-03 18:12:32 -08:00
Zach Fox
6f077f3a92
Fix Security Pic Change dialog after QML security changes
2018-01-03 11:28:39 -08:00
Zach Fox
681b5173cd
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore
...
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
2018-01-03 09:34:14 -08:00
milad
63801ce802
add .jsc, remove duplicate qmlc, and remote Utils.jsc
2018-01-02 17:15:23 -08:00
Zach Fox
917db14879
Add a link to My Purchases from Wallet Home
2018-01-02 15:26:11 -08:00
Zach Fox
47a209dc4c
Make things slightly better?
2018-01-02 13:11:00 -08:00
vladest
a84e585679
Merge
2018-01-02 21:49:00 +01:00
vladest
afc3082593
Cleanup. Errors checks
2017-12-28 13:16:51 +01:00
vladest
35fee739c5
Use buttons index
2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez
01c1032540
fixed constant names, added another URL check
2017-12-27 10:51:58 -08:00
vladest
ffcccacfa5
Selection consistency #2
2017-12-25 23:46:06 +01:00
vladest
cb7472c270
Selection consistency #1
2017-12-25 20:14:31 +01:00
vladest
9fa78bae0d
Merge branch 'master' into tablet_home_paginate
2017-12-23 17:46:51 +01:00
vladest
a497047666
Refactored using new GridView approach
2017-12-23 17:44:26 +01:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3
...
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-22 14:31:03 -08:00
Zach Fox
ef71470d85
Small change
2017-12-21 17:03:04 -08:00
Zach Fox
2acea75db3
Commerce: Checkout Layout Revisions
2017-12-21 16:09:46 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
luiscuenca
38bfddf786
Added filter for QT autogenerated functions and integrated it to Developers menu
2017-12-21 16:26:06 -07:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
luiscuenca
54297e00a8
button size fix
2017-12-21 12:48:21 -07:00
luiscuenca
d93828f2f0
Fix an improve currentAPI.js
2017-12-21 11:50:02 -07:00
vladest
2bca0939b3
Preliminary proxy model
2017-12-21 19:32:13 +01:00
vladest
d6e1a3ea41
Merge conflicts solved
2017-12-21 09:02:04 +01:00
vladest
79f9b54f6a
Store button list in the resources section of fake item instead of C++ space
2017-12-20 22:59:07 +01:00
Zach Fox
e02e6790fe
Fix error state for Commerce passphrase TextInputs
2017-12-20 13:46:02 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel
...
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-20 09:18:10 -08:00
Zach Fox
a72ed27a25
CR feedback
2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-19 16:26:58 -08:00
vladest
012f65a87f
Merge branch 'master' into tablet_home_paginate
2017-12-19 21:40:47 +01:00
howard-stearns
bb499000a6
trailing semicolon
2017-12-19 10:51:32 -08:00
howard-stearns
16a58ddf5a
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
2017-12-19 10:48:34 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
Zach Fox
afd3cf7045
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-18 14:08:09 -08:00
Zach Fox
e075cd79fb
Add Passphrase Auth Status data tracking
2017-12-18 11:51:12 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
vladest
38453afb3b
Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope
2017-12-18 14:56:33 +01:00
vladest
62a762b879
Merge branch 'master' into tablet_home_paginate
2017-12-16 20:32:21 +01:00
vladest
cdb9d72387
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
2017-12-16 20:27:19 +01:00
howard-stearns
d730b7b87b
consistent goToUser behavior in PAL, and be able to go to flying user.
2017-12-15 17:00:54 -08:00
Zach Fox
89795272c7
More security images!
2017-12-15 16:26:13 -08:00
Alexander Ivash
32acc8ad47
8992 Login window is small in tablet
2017-12-14 23:53:33 +00:00
Zach Fox
af346f2ced
Protocol change
2017-12-14 10:09:10 -08:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
Seth Alves
d3e24d3629
Merge pull request #11960 from ElderOrb/FB10334
...
10334 Unable to type in Go To app search bar after UI reappears from …
2017-12-13 09:06:53 -08:00
vladest
99a6b12828
Merge branch 'master' into tablet_home_paginate
2017-12-13 16:02:29 +01:00
vladest
e052784431
Code style
2017-12-12 14:12:03 +01:00
Zach Fox
2225352b1e
Fix wallet setup
2017-12-11 17:15:15 -08:00
Howard Stearns
8e36228c12
Merge pull request #11948 from MandatoryMania/noFundsSymbol
...
Provides a nice alert in case of insufficient funds to make a purchase
2017-12-11 11:45:27 -08:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
vladest
e797f5cda0
Merge branch 'master' into tablet_home_paginate
2017-12-11 17:53:21 +01:00
vladest
cc78fc1f53
Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections
2017-12-11 17:50:16 +01:00
Alexander Ivash
cb471582e5
10334 Unable to type in Go To app search bar after UI reappears from moving Avatar
2017-12-10 01:34:03 +03:00
Zach Fox
8485503063
Merge pull request #11958 from humbletim/fix-pal-connections
...
Fix for Connections UI lockup
2017-12-08 18:34:25 -08:00
humbletim
abba85ac54
add missing colonsemi
2017-12-08 18:14:30 -05:00
humbletim
34243f4239
disable connections console.log to prevent UI lag
2017-12-08 17:10:57 -05:00
vladest
3aaf666295
Merge branch 'master' into tablet_home_paginate
2017-12-08 19:59:41 +01:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Seth Alves
eda63e5758
Merge pull request #11919 from ElderOrb/FB9706
...
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-08 07:01:00 -08:00
H Q
4ce784291c
Provides a nice alert in case of insufficient funds to make a purchase
2017-12-07 15:13:01 -08:00
vladest
9b3db0725b
Retreive buttons list from tablet proxy
2017-12-07 22:36:34 +01:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
vladest
c9f86e4b6b
Merge branch 'master' into tablet_home_paginate
2017-12-07 19:16:13 +01:00
vladest
3c11d29a7f
Something intermediate
2017-12-07 19:13:39 +01:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633
...
Fix image overlay's subImage property's width and height support
2017-12-07 09:19:43 -08:00
David Rowe
efd72be96f
Fix image overlay's subImage property's width and height support
2017-12-07 12:05:46 +13:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -08:00
Zach Fox
902064ed37
Cleanup debug stuff
2017-12-05 15:26:55 -08:00
Zach Fox
c807fc80e3
Add marketplace cta referrer
2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e
Bugfixes
2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5
Add data tracking for wallet setup
2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222
Add data tracking for purchase and rez
2017-12-05 13:09:09 -08:00
Zach Fox
c80039ea87
Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1
...
Fix gray/incorrect security image after relog
2017-12-05 11:21:06 -08:00
Zach Fox
1507620fd5
Merge pull request #11921 from ElderOrb/FB10024
...
10024 Wallet: TextField Focus Problems
2017-12-05 10:52:08 -08:00
Zach Fox
d59c9bd73a
Fix gray/incorrect security image after relog
2017-12-05 10:27:40 -08:00
luiscuenca
d70a3685b8
Clean up
2017-12-04 15:29:13 -08:00
luiscuenca
390c59b45c
Change menu and minor fixes
2017-12-04 15:29:01 -08:00
Alexander Ivash
f7328f05fb
remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface
2017-12-05 00:51:42 +03:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation
...
Call reset() on Wallet before creating new wallet
2017-12-04 13:05:36 -08:00
Alexander Ivash
8a5904373b
remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button
2017-12-05 00:04:46 +03:00
Alexander Ivash
c67ff3b5d8
10024 Wallet: TextField Focus Problems
...
note: removed excessive MouseArea-s
2017-12-05 00:03:48 +03:00
vladest
a0878298d5
Merge branch 'master' into tablet_home_paginate
2017-12-04 20:55:38 +01:00
Brad Hefta-Gaub
06cf194ec7
Merge pull request #11910 from ctrlaltdavid/21626
...
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-03 18:09:17 -08:00
Alexander Ivash
d60f082796
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-03 23:24:34 +03:00
luiscuenca
4030688e7a
added record wav files
2017-12-03 11:54:37 -07:00
vladest
e1df38784b
Merge branch 'master' into tablet_home_paginate
2017-12-02 22:40:10 +01:00
Brad Hefta-Gaub
3f705a7baf
Merge pull request #11858 from vladest/fix_tablet_scrollbars
...
Use ScrollBars from QQC2, which supports mouse and touch events
2017-12-02 12:51:14 -08:00
vladest
fd9539a9e4
Using Flickable signals to remove hover state instead of timer. No more delays
2017-12-02 13:57:12 +01:00
Howard Stearns
e2efe062fe
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh
...
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-12-01 13:57:34 -08:00
Zach Fox
ebb2e50d01
Fix month display in commerce...
2017-12-01 09:29:19 -08:00
vladest
570be69fcf
Fix warnings after apps closed
2017-12-01 09:52:45 +01:00
David Rowe
fd76c7a88b
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-01 17:40:34 +13:00
Zach Fox
24e5994f20
The nuclear option is a bad option.
2017-11-30 15:55:09 -08:00
Zach Fox
009d3a18a3
Call reset() on Ledger and Wallet before creating new wallet
2017-11-30 15:40:20 -08:00
