David Back
|
ddbe02dd4e
|
CR changes and fix extra info toggle
|
2018-10-22 11:56:47 -07:00 |
|
David Back
|
76dbee265e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
|
2018-10-19 16:05:04 -07:00 |
|
David Back
|
9cd3c35cc6
|
style changes and fix hidden top row
|
2018-10-17 18:18:51 -07:00 |
|
Brad Hefta-Gaub
|
0e0542ec6e
|
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
|
2018-10-17 13:29:20 -07:00 |
|
David Back
|
001601d28f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
|
2018-10-17 11:30:10 -07:00 |
|
David Back
|
a2aa63e9ed
|
adjust no entities message
|
2018-10-16 14:28:52 -07:00 |
|
Thijs Wenker
|
f1885159d2
|
style fixes
|
2018-10-15 21:17:41 +02:00 |
|
unknown
|
978cd4bb77
|
styling tweaks, fix X clear search not refreshing
|
2018-10-12 18:57:26 -07:00 |
|
unknown
|
6320f9bab7
|
tweaks
|
2018-10-12 11:39:54 -07:00 |
|
unknown
|
97438a08d9
|
styling fixes, add icon, adjust Types text, click outside to close
|
2018-10-11 23:04:33 -07:00 |
|
David Back
|
4883a60afc
|
entity list type filter WIP - still some style issues
|
2018-10-11 18:55:14 -07:00 |
|
Thijs Wenker
|
66c533b557
|
move export selection button to bottom of the list
|
2018-10-03 19:35:03 +02:00 |
|
John Conklin II
|
9a614d7523
|
Merge pull request #13977 from dback2/newEntityListView
New optimized entity list view
|
2018-10-03 09:23:11 -07:00 |
|
Seth Alves
|
834699fa12
|
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
|
2018-10-02 08:54:12 -07:00 |
|
John Conklin II
|
9cbd819a39
|
Merge pull request #13965 from ctrlaltdavid/M17428-f
Mini tablet in palm
|
2018-10-01 16:56:36 -07:00 |
|
John Conklin II
|
3bbc01477e
|
Merge pull request #14055 from davidkelly/dk/18147
Do not have active buy button on invalidated items
|
2018-10-01 16:50:53 -07:00 |
|
David Back
|
215e7e6da7
|
remove unneeded variable
|
2018-09-27 17:04:43 -07:00 |
|
David Back
|
b7c098c260
|
remove unneeded variable
|
2018-09-27 17:02:54 -07:00 |
|
David Back
|
4204adf60f
|
fix deselecting entity when re-clicking row, fix ctrl/shift selections
|
2018-09-27 16:59:23 -07:00 |
|
David Rowe
|
fc78d0582e
|
Tidying
|
2018-09-28 10:18:00 +12:00 |
|
David Rowe
|
2456fd0e99
|
Merge branch 'master' into M17428-f
|
2018-09-28 08:41:57 +12:00 |
|
David Back
|
046a4e4041
|
ordering/comment tweak
|
2018-09-26 18:02:15 -07:00 |
|
David Back
|
7e7dc33acd
|
more CR changes + fix resizing
|
2018-09-26 17:57:44 -07:00 |
|
Howard Stearns
|
940db4f112
|
fix recently introduced bug
|
2018-09-26 15:01:30 -07:00 |
|
John Conklin II
|
9916496118
|
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74
Fix entity list selection failing when selecting entities not in list
|
2018-09-24 11:02:36 -07:00 |
|
David Back
|
df48c60a8f
|
further improvements/fixes
|
2018-09-24 10:28:37 -07:00 |
|
David Kelly
|
fe9b972c80
|
Do not have active buy button on invalidated items
|
2018-09-21 15:46:57 -07:00 |
|
David Back
|
506b9d8645
|
more fixes for deleting/selecting, potential optimizations
|
2018-09-21 10:02:41 -07:00 |
|
David Rowe
|
5719b7020d
|
Merge branch 'master' into M17428-f
|
2018-09-21 10:47:56 +12:00 |
|
Ryan Huffman
|
1ee655c8f8
|
Fix sorting of entity list not working as expected
|
2018-09-20 13:51:00 -07:00 |
|
Ryan Huffman
|
72adfb7ff0
|
Fix entity list selection failing when selecting entities not in list
|
2018-09-20 13:46:22 -07:00 |
|
David Back
|
e1758c7974
|
CR changes
|
2018-09-20 11:08:01 -07:00 |
|
David Back
|
e701c79984
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView
|
2018-09-19 14:06:28 -07:00 |
|
Zach Fox
|
9e50904376
|
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
|
2018-09-14 14:36:22 -07:00 |
|
David Back
|
86972cf4fb
|
Merge pull request #13992 from dback2/entityListSearchCase
Fix entity list search case-sensitivity and allow id search
|
2018-09-14 10:58:44 -07:00 |
|
David Back
|
296e2ba488
|
lowercase search term at start
|
2018-09-14 09:57:27 -07:00 |
|
howard-stearns
|
685b2978ce
|
Text tuning for wallet setup call to action
|
2018-09-14 08:26:25 -07:00 |
|
unknown
|
f9480c24a5
|
store search term lower
|
2018-09-13 20:07:49 -07:00 |
|
David Back
|
b65bd6736f
|
also allow search using entity id
|
2018-09-13 18:20:11 -07:00 |
|
David Back
|
4bc046187a
|
fix searching case-sensitivity
|
2018-09-13 15:06:14 -07:00 |
|
David Back
|
34afe7a69a
|
remove fixing search cases (for separate PR)
|
2018-09-13 15:01:49 -07:00 |
|
David Back
|
56ddafed26
|
fix deleting scroll-away items, fix searching case sensitivity, comments
|
2018-09-13 14:56:12 -07:00 |
|
Zach Fox
|
01073ca18d
|
Lots of changes; marketplaces.js working now
|
2018-09-12 15:46:17 -07:00 |
|
David Back
|
70d427f852
|
more fixes for resizing, deleting, selecting etc
|
2018-09-12 09:43:14 -07:00 |
|
Zach Fox
|
6d345e506b
|
Marketplaces.js WIP
|
2018-09-11 19:42:12 -07:00 |
|
David Back
|
7eb05a3cc8
|
merge changes, fix various issues
|
2018-09-11 16:34:21 -07:00 |
|
David Rowe
|
a1c49bd2b6
|
Hide mini tablet if lasering or grabbing something else
|
2018-09-12 11:18:26 +12:00 |
|
David Rowe
|
de95ee0a18
|
Merge branch 'master' into M17428-f
|
2018-09-12 09:49:29 +12:00 |
|
Ryan Huffman
|
4b8f5ea6b9
|
Fix syntax and duplicate event handlers in entityList.js
|
2018-09-10 16:44:13 -07:00 |
|
Ryan Huffman
|
5aa5552727
|
Fix PROFILE not forwarding calls when disabled
|
2018-09-10 14:07:25 -07:00 |
|