Vladyslav Stelmakhovskyi
|
849d65f95f
|
Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
|
2017-04-03 19:32:09 +02:00 |
|
Zach Fox
|
8a96969471
|
Merge pull request #9873 from highfidelity/PAL_v2
PAL v2.0
|
2017-03-31 17:00:41 -07:00 |
|
Zach Fox
|
fd3167ca9c
|
'PEOPLE' back to 'CONNECTIONS'
|
2017-03-31 16:41:25 -07:00 |
|
David Kelly
|
8ceb6a20f0
|
friend/unfriend working
|
2017-03-31 15:05:21 -07:00 |
|
Zach Fox
|
6a4c2c5e12
|
Fix issues; checkpoint on new ComboDialog
|
2017-03-31 14:56:42 -07:00 |
|
Dante Ruiz
|
70d2d69557
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView
|
2017-03-31 19:29:31 +01:00 |
|
Dante Ruiz
|
9658e1b8ac
|
better web view handling
|
2017-03-31 19:25:03 +01:00 |
|
Dante Ruiz
|
8f402c73b0
|
saving work 2.0
|
2017-03-31 01:18:31 +01:00 |
|
Zach Fox
|
05c34fb3ee
|
Move some things around so ComboBox works (and layout improves)
|
2017-03-30 15:19:19 -07:00 |
|
Zach Fox
|
c24b8b47a9
|
Minor layout changes
|
2017-03-30 14:08:29 -07:00 |
|
Howard Stearns
|
0edbf1fbd9
|
Merge pull request #10044 from howard-stearns/pal-backend-integration
Pal backend integration
|
2017-03-30 12:55:11 -07:00 |
|
David Kelly
|
e66c075f8e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-30 10:14:29 -07:00 |
|
Dante Ruiz
|
cb8660c699
|
saving work
|
2017-03-30 01:34:14 +01:00 |
|
Zach Fox
|
4887081e2c
|
New PAL colors; slight layout changes
|
2017-03-29 16:30:24 -07:00 |
|
Zach Fox
|
a6ff3fcdb7
|
Tablet PAL bugfix; Connections help text v1
|
2017-03-29 15:47:19 -07:00 |
|
Anthony J. Thibault
|
332dfa098f
|
Fix for disappearing toolbar after reload all scripts
|
2017-03-29 14:10:26 -07:00 |
|
Howard Stearns
|
b8f557ca54
|
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration
|
2017-03-29 13:30:15 -07:00 |
|
Howard Stearns
|
c795d2ca3b
|
Four-way discoverability. (Needs testing.)
|
2017-03-28 18:31:08 -07:00 |
|
Zach Fox
|
b776f25b3b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
|
2017-03-28 18:09:17 -07:00 |
|
Zach Fox
|
81264c998b
|
Revert "Merge from upstream/master"
This reverts commit b5ba4a109d .
|
2017-03-28 17:39:45 -07:00 |
|
Zach Fox
|
b5ba4a109d
|
Merge from upstream/master
|
2017-03-28 17:37:34 -07:00 |
|
Dante Ruiz
|
a76e5ef8d9
|
improve the design of the tablet goto
|
2017-03-28 23:02:23 +01:00 |
|
Seth Alves
|
48ea9acfb3
|
Merge pull request #10016 from druiz17/tablet-goto
Porting goto to the tablet
|
2017-03-27 10:04:11 -08:00 |
|
Dante Ruiz
|
b8eac7abef
|
revoming useless code
|
2017-03-27 16:17:50 +01:00 |
|
Vladyslav Stelmakhovskyi
|
edb66ae704
|
Merge branch 'tablet-ui' into tablet-ui-audio-screen
|
2017-03-25 13:20:43 +01:00 |
|
Vladyslav Stelmakhovskyi
|
fc23c348cb
|
Implemented Audio settings screen for Tablet UI
|
2017-03-25 13:17:38 +01:00 |
|
Dante Ruiz
|
2a59139c76
|
trying to fix focus issue
|
2017-03-25 01:17:37 +01:00 |
|
Dante Ruiz
|
9e2768cc84
|
saving work
|
2017-03-25 01:06:21 +01:00 |
|
Dante Ruiz
|
d9046a1982
|
goto on the tablet
|
2017-03-24 23:54:54 +01:00 |
|
Dante Ruiz
|
a078121c46
|
saving work
|
2017-03-24 00:23:13 +01:00 |
|
Zach Fox
|
3f95982f34
|
Fix bug due to incorrect merge...
|
2017-03-23 14:00:50 -07:00 |
|
Zach Fox
|
98ee02f84f
|
Use OpacityMask instead of hack; fix connectionsTab
|
2017-03-23 10:49:31 -07:00 |
|
Zach Fox
|
a7623dcac8
|
Use OpacityMask instead of hack; fix connectionsTab
|
2017-03-23 10:48:44 -07:00 |
|
Dante Ruiz
|
ae111ff2e9
|
Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto
|
2017-03-23 18:25:31 +01:00 |
|
Dante Ruiz
|
af97c7275e
|
Use loadQMlSource if no stack is aviable
|
2017-03-23 17:03:24 +01:00 |
|
Zach Fox
|
692ef369c7
|
Attempted Stale PAL fix - hard to test!
|
2017-03-22 15:14:11 -07:00 |
|
Zach Fox
|
bf191eabb7
|
Some new stale PAL behavior
|
2017-03-22 13:35:48 -07:00 |
|
Zach Fox
|
058faa8c0f
|
Row color bugfix
|
2017-03-21 10:03:51 -07:00 |
|
Vladyslav Stelmakhovskyi
|
fb0adae0b1
|
Scripts debug window in Tablet UI
|
2017-03-21 15:04:38 +01:00 |
|
Zach Fox
|
29e97381eb
|
PAL open, user leaves, gray out row
|
2017-03-20 17:20:28 -07:00 |
|
Faye Li
|
9cab8b6c4a
|
end of day commit
|
2017-03-20 17:04:29 -07:00 |
|
Faye Li
|
1d095b8158
|
added back forward and back button on nav bar
|
2017-03-20 15:57:59 -07:00 |
|
Faye Li
|
b6bf58d5be
|
rearrange layout of main tablet go to screen
|
2017-03-20 15:28:30 -07:00 |
|
Zach Fox
|
d16acc5a7f
|
Stale PAL Notification
|
2017-03-20 15:24:49 -07:00 |
|
Zach Fox
|
0506fc0033
|
New goTo() behavior; Fix goBack
|
2017-03-20 12:55:38 -07:00 |
|
Seth Alves
|
2e29ff3114
|
Merge pull request #9934 from fayeli/edit-import-entities
Adding Import Entities button on the Create tab of Edit
|
2017-03-20 09:13:08 -08:00 |
|
Vladyslav Stelmakhovskyi
|
5335bf8862
|
Menu items in Tablet UI now wrapped
|
2017-03-18 15:58:16 +01:00 |
|
Faye Li
|
33a7ff825e
|
indicate expecting json file on button text
|
2017-03-17 11:37:38 -07:00 |
|
Faye Li
|
6531efffbc
|
hook up qml button to edit.js
|
2017-03-17 11:22:07 -07:00 |
|
Zach Fox
|
fc2a501474
|
Cleanup JS<->QML messaging
|
2017-03-16 15:38:39 -07:00 |
|