Stephen Birarda
|
80cf7b6c76
|
resolve conflicts on merge with upstream/master
|
2015-08-27 14:50:04 -07:00 |
|
Brad Davis
|
8cd13cad00
|
Merge pull request #5661 from sethalves/linux-memory-debugger
call setup_memory_debugger from common macros rather than from everywhere
|
2015-08-26 15:43:08 -07:00 |
|
Andrew Meadows
|
0835b79e33
|
Merge pull request #5646 from birarda/ds-cleanup
de-bloat the domain-server by adding a gatekeeper
|
2015-08-26 15:42:43 -07:00 |
|
Stephen Birarda
|
1a019187af
|
Merge branch 'ds-cleanup' into asset-upload
|
2015-08-26 15:07:43 -07:00 |
|
Stephen Birarda
|
cd7d0f383b
|
allow editors who can't be verified in the short term
|
2015-08-26 15:07:29 -07:00 |
|
Stephen Birarda
|
4039c2e3e0
|
fix for asset-server naming, deadlock in timeout/wait
|
2015-08-26 14:27:12 -07:00 |
|
Stephen Birarda
|
352f3543c3
|
resolve conflicts on merge with ds-cleanup
|
2015-08-26 13:33:50 -07:00 |
|
Stephen Birarda
|
c8545c8aeb
|
remove an empty line
|
2015-08-26 12:37:47 -07:00 |
|
Stephen Birarda
|
dc1f726283
|
don't assign the asset-server in domain by default
|
2015-08-26 12:36:48 -07:00 |
|
Ryan Huffman
|
aa7d8678e1
|
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
|
2015-08-26 12:26:11 -07:00 |
|
Seth Alves
|
695ffa29c7
|
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
|
2015-08-26 11:09:59 -07:00 |
|
Atlante45
|
179ee73e26
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
|
2015-08-26 16:50:33 +02:00 |
|
Ryan Huffman
|
4e3d0758e5
|
Remove UNUSED_2
|
2015-08-25 15:07:07 -07:00 |
|
Stephen Birarda
|
c776f04ab2
|
don't allow in a user who should have edit but not verified
|
2015-08-25 14:36:22 -07:00 |
|
Stephen Birarda
|
9940f375ea
|
repairs for CR comments
|
2015-08-25 10:02:43 -07:00 |
|
Stephen Birarda
|
17befac262
|
use fixed width for stats tables
|
2015-08-24 18:10:21 -07:00 |
|
Stephen Birarda
|
b8ac9aa5eb
|
update jquery and bootstrap in DS
|
2015-08-24 18:02:26 -07:00 |
|
Stephen Birarda
|
d02e5b2450
|
fix a typo in comment in DomainGatekeeper
|
2015-08-24 15:10:27 -07:00 |
|
Stephen Birarda
|
a9c04e5116
|
don't allow verified connection without username
|
2015-08-24 15:01:39 -07:00 |
|
Stephen Birarda
|
c6f1567361
|
add a debug for refused connection in DomainGatekeeper
|
2015-08-24 14:58:25 -07:00 |
|
Stephen Birarda
|
fe591f61cc
|
fix class rename in processConnectRequestPacket
|
2015-08-24 14:54:48 -07:00 |
|
Stephen Birarda
|
d57c1fc2d5
|
fix a typo in DomainGatekeeper comment
|
2015-08-24 14:50:18 -07:00 |
|
Stephen Birarda
|
7591a29c48
|
add back indentation to STATICALLY_ASSIGNED_NODES
|
2015-08-24 14:44:24 -07:00 |
|
Stephen Birarda
|
d2acf327dd
|
fix NodeConnectionData discrepancy on request
|
2015-08-24 14:43:49 -07:00 |
|
Stephen Birarda
|
e8772277de
|
de-bloat the domain-server by adding a DomainGatekeeper
|
2015-08-24 14:19:33 -07:00 |
|
Andrew Meadows
|
0fb2390877
|
Merge pull request #5604 from birarda/master
report non-skewed uptime from domain-server
|
2015-08-21 09:16:21 -07:00 |
|
Stephen Birarda
|
aac15e52bb
|
add explicit cast to double for uptime
|
2015-08-20 10:19:34 -07:00 |
|
Seth Alves
|
c25082d86f
|
use -fsanitize=address in all code rather than just the top-level links
|
2015-08-20 10:14:16 -07:00 |
|
Stephen Birarda
|
74d6e5ba89
|
make sure LNL goes down before domain-server
|
2015-08-20 10:01:12 -07:00 |
|
Stephen Birarda
|
b386a95d08
|
fix sort for node uptime
|
2015-08-19 18:31:42 -07:00 |
|
Stephen Birarda
|
2738f65c10
|
have domain-server report non-skewed uptime
|
2015-08-19 18:23:11 -07:00 |
|
Seth Alves
|
2056f588e3
|
if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux
|
2015-08-19 18:03:16 -07:00 |
|
Stephen Birarda
|
42a7262707
|
Merge pull request #5565 from murillodigital/node-version
DO NOT MERGE - Node versioning
|
2015-08-19 13:32:48 -07:00 |
|
Ryan Huffman
|
da7c9198c5
|
Remove superfluous log message
|
2015-08-19 10:01:40 -07:00 |
|
Ryan Huffman
|
63d0205d1e
|
Move domain settings retrieval to UDT
|
2015-08-18 23:11:33 -07:00 |
|
Stephen Birarda
|
0f77ab8611
|
resolve conflicts on merge with upstream/master
|
2015-08-18 11:45:55 -07:00 |
|
Seth Alves
|
4a456488a1
|
remove the option to persist entities as anything other than json.gz files
|
2015-08-17 14:01:25 -07:00 |
|
Leonardo Murillo
|
b345d75e4d
|
More cleanup and showing version in ds web gui
|
2015-08-13 16:44:28 -06:00 |
|
Leonardo Murillo
|
7c4813f1cf
|
Another versioning checkpoint + cleanup
|
2015-08-13 16:35:55 -06:00 |
|
Leonardo Murillo
|
cda5b29fd3
|
Another take at versioning details exchange - checkpoint
|
2015-08-13 14:19:13 -06:00 |
|
Bennett Goble
|
d5691b1196
|
Add QDataStream include to DomainServerWebSessionData.cpp
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
|
2015-08-08 17:17:29 -04:00 |
|
Stephen Birarda
|
eec382ade8
|
Merge pull request #5513 from bwent/domain-server-authentication
Add connection token UUId to sign with username when connecting to domain-server
|
2015-08-07 10:05:00 -07:00 |
|
bwent
|
ffccc9ca96
|
clean up formatting, make connectionUUID const in NodeList
|
2015-08-06 10:11:22 -07:00 |
|
bwent
|
73ea958640
|
add check if user is local user
|
2015-08-06 09:01:25 -07:00 |
|
bwent
|
a8f9f9d746
|
clean-up formatting
|
2015-08-05 17:43:03 -07:00 |
|
bwent
|
45e3eafce3
|
Remove ERR_get_error call
|
2015-08-05 16:00:25 -07:00 |
|
bwent
|
ab2b54a6b2
|
Add connection token to sign with username when connecting to domain-server
|
2015-08-05 15:33:59 -07:00 |
|
bwent
|
8868148c94
|
Parital fix for padding error using RSA_sign and RSA_verify
|
2015-08-05 14:07:25 -07:00 |
|
Stephen Birarda
|
052978898e
|
resolve conflicts on merge with upstream master
|
2015-08-05 11:16:20 -07:00 |
|
bwent
|
fc385d9bc1
|
debugging
|
2015-08-05 10:29:30 -07:00 |
|
bwent
|
b9364a47a1
|
Debug null QUuid being stored in conenctionTokenHash
|
2015-08-04 15:31:26 -07:00 |
|
bwent
|
54dd5da64c
|
To debug RSA padding error
|
2015-08-04 12:02:23 -07:00 |
|
bwent
|
af293ec6dd
|
Fix DomainServerConnectionTOken packet writing/resetting
|
2015-08-04 12:02:23 -07:00 |
|
bwent
|
244cc016ab
|
Generate session token UUIDs to be signed with username
|
2015-08-04 12:02:23 -07:00 |
|
Seth Alves
|
adcd91e3ff
|
Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.
|
2015-08-04 07:23:24 -07:00 |
|
Stephen Birarda
|
b68c7fd92a
|
first adjustment in NLPacket after type is known
|
2015-07-23 16:59:08 -07:00 |
|
Stephen Birarda
|
9556fecbe2
|
initial changes to make _nodeSocket a udt::Socket
|
2015-07-20 17:10:22 -07:00 |
|
Stephen Birarda
|
0f534b9f7b
|
fixes for new read and NLPacketList
|
2015-07-17 15:43:20 -07:00 |
|
Atlante45
|
d505527e5a
|
Remove setExtendedheader call
|
2015-07-17 15:38:36 -07:00 |
|
Stephen Birarda
|
8ff8a17f02
|
remove TODO added for DS, check sockets
|
2015-07-17 14:17:48 -07:00 |
|
Stephen Birarda
|
7d60b86f52
|
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
|
2015-07-17 09:07:39 -07:00 |
|
Stephen Birarda
|
2a2eb39066
|
repairs for DS path query and response
|
2015-07-16 17:08:06 -07:00 |
|
Stephen Birarda
|
487969ef7a
|
pack reason size as quint16
|
2015-07-16 16:45:16 -07:00 |
|
Stephen Birarda
|
f31675c4c6
|
fix ice-server packets
|
2015-07-16 14:21:37 -07:00 |
|
Stephen Birarda
|
e90ace6231
|
fix child assignment UUID, adjust for NLPacket after unpack
|
2015-07-15 12:37:30 -07:00 |
|
Stephen Birarda
|
b115bd1a55
|
resolve conflicts on merge with huffman/receive_packets
|
2015-07-15 10:52:07 -07:00 |
|
Ryan Huffman
|
44c99ef89a
|
Replace bytesAvailable with bytesLefToRead
|
2015-07-15 10:44:51 -07:00 |
|
Stephen Birarda
|
e127c5c06d
|
rename Packet methods for clarity
|
2015-07-15 10:40:40 -07:00 |
|
Stephen Birarda
|
ccc2649d26
|
fix packing of domain list header
|
2015-07-14 21:14:15 -07:00 |
|
Stephen Birarda
|
89c44ded38
|
repairs for domain-server PacketList sending
|
2015-07-14 21:01:26 -07:00 |
|
Stephen Birarda
|
a5ca1f7125
|
fix variable setup in Packet constructor
|
2015-07-14 19:15:18 -07:00 |
|
Atlante45
|
3abde577e2
|
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
|
2015-07-14 16:58:26 -07:00 |
|
Stephen Birarda
|
15ca129005
|
fix for registration of methods with typedef
|
2015-07-14 16:46:17 -07:00 |
|
Atlante45
|
fbb6a94579
|
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
|
2015-07-14 16:36:28 -07:00 |
|
Ryan Huffman
|
d8bec3983f
|
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
domain-server/src/DomainServer.cpp
|
2015-07-14 16:13:54 -07:00 |
|
Stephen Birarda
|
6d6b9b8117
|
pass sending node to processListRequestPacket
|
2015-07-14 16:11:48 -07:00 |
|
Ryan Huffman
|
56b5c9acff
|
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
assignment-client/src/entities/EntityServer.cpp
domain-server/src/DomainServer.cpp
|
2015-07-14 14:53:45 -07:00 |
|
Ryan Huffman
|
4d9b28688d
|
Update reinterpret_cast call that should be dynamic_cast
|
2015-07-14 14:49:51 -07:00 |
|
Ryan Huffman
|
84796b20e0
|
Fix call to constructICEPingReplyPacket
|
2015-07-14 14:45:45 -07:00 |
|
Ryan Huffman
|
90407e2720
|
Remove redundant check in if
|
2015-07-14 14:45:32 -07:00 |
|
Stephen Birarda
|
d617b71232
|
remove SharedNodePointer from some packet callbacks
|
2015-07-14 14:27:26 -07:00 |
|
Stephen Birarda
|
fbd287472d
|
make NodeData parseData take only packet
|
2015-07-14 14:09:00 -07:00 |
|
Stephen Birarda
|
0637f589b5
|
add PacketListener to help unregister for packets
|
2015-07-14 13:52:38 -07:00 |
|
Atlante45
|
81ad0056c3
|
Fix a few node deref
|
2015-07-13 15:34:37 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Stephen Birarda
|
ede39515d8
|
update parseData for new network API
|
2015-07-13 14:26:10 -07:00 |
|
Atlante45
|
957e6394a9
|
sendPacket function take Node& not a pointer
|
2015-07-13 11:57:20 -07:00 |
|
Stephen Birarda
|
e5d8a39dde
|
update DomainServer to new packet receive API
|
2015-07-13 11:11:52 -07:00 |
|
Stephen Birarda
|
3d62162812
|
cleanup octree networking code to use new API
|
2015-07-13 09:40:26 -07:00 |
|
Stephen Birarda
|
d85fbbfb74
|
update NodeList for new packet receive code
|
2015-07-10 17:45:23 -07:00 |
|
Stephen Birarda
|
dd30813ae0
|
remove an extra line in DomainServer
|
2015-07-09 12:39:43 -07:00 |
|
Stephen Birarda
|
11a4c20a21
|
fix payloadSize write in DomainServer
|
2015-07-09 12:23:54 -07:00 |
|
Stephen Birarda
|
cafa8b65f5
|
specify the size of the DTLS required packet
|
2015-07-09 12:07:18 -07:00 |
|
Stephen Birarda
|
adf2ce85f1
|
pack the size of the connection denied reason
|
2015-07-09 12:03:15 -07:00 |
|
Stephen Birarda
|
a363f42bb2
|
pass const NLPacket& for all sendUnreliablePacket calls
|
2015-07-09 11:42:18 -07:00 |
|
Stephen Birarda
|
6cf0018914
|
repairs required for domain-server build
|
2015-07-09 11:07:13 -07:00 |
|
Stephen Birarda
|
74940a2132
|
replace lingering PacketTypes in old format
|
2015-07-08 10:18:13 -07:00 |
|
Ryan Huffman
|
60538d4a82
|
Merge branch 'atp' of github.com:birarda/hifi into atp
Conflicts:
libraries/audio-client/src/AudioIOStats.cpp
|
2015-07-07 16:26:22 -07:00 |
|
Ryan Huffman
|
3690ecc28f
|
Add std::move to sendPacket calls
|
2015-07-07 16:24:11 -07:00 |
|
Stephen Birarda
|
1f68ad892a
|
replace PacketList usage with NLPacketList
|
2015-07-07 16:14:57 -07:00 |
|
Stephen Birarda
|
bb15326676
|
repair send of path query packet
|
2015-07-07 16:02:21 -07:00 |
|
Stephen Birarda
|
6064a2d4e2
|
CR fixes for DomainServer
|
2015-07-07 15:21:20 -07:00 |
|
Stephen Birarda
|
ea3f61a0c5
|
remove use of payload in DomainServer
|
2015-07-06 17:17:40 -07:00 |
|
Stephen Birarda
|
3fa785c545
|
fix domain check in packets for new API
|
2015-07-06 17:03:26 -07:00 |
|
Stephen Birarda
|
33a9a04d9e
|
allow a packet to be created with extended header
|
2015-07-06 16:18:49 -07:00 |
|
Stephen Birarda
|
57d76f488c
|
make PacketPayload a QIODevice subclass
|
2015-07-06 11:33:46 -07:00 |
|
Stephen Birarda
|
8dd91b8795
|
don't force source ID on ICE ping packets
|
2015-07-02 17:34:52 -07:00 |
|
Stephen Birarda
|
0d64e82fe2
|
replace PacketType declarations with PacketType::Value
|
2015-07-02 16:38:52 -07:00 |
|
Howard Stearns
|
a736d0d901
|
Initial value false for domain-server wantEditLogging (used by assignment clients).
|
2015-06-29 11:33:55 -07:00 |
|
Seth Alves
|
b0f6826d17
|
Merge pull request #4995 from birarda/domain-dtls
speed up initial connection to domains
|
2015-05-29 10:50:01 -07:00 |
|
Stephen Birarda
|
e91ee7e7e3
|
only send add packet for nodes in interest set
|
2015-05-29 09:49:54 -07:00 |
|
Stephen Birarda
|
cb7b23f346
|
install DS message handler in DomainServer
|
2015-05-28 17:04:15 -07:00 |
|
Stephen Birarda
|
29d3ca85d9
|
cleanup debug logs for DS/node ping punch
|
2015-05-28 16:53:13 -07:00 |
|
Stephen Birarda
|
493a9da43e
|
make sure DS log handler is cleaned up
|
2015-05-28 16:23:14 -07:00 |
|
Stephen Birarda
|
9d2e1773a0
|
fix memory issues for immediate ice pings
|
2015-05-28 15:31:21 -07:00 |
|
Stephen Birarda
|
e096cbe040
|
have ice-server immediately send peer to DS
|
2015-05-28 14:25:18 -07:00 |
|
Stephen Birarda
|
531ef1fa1c
|
change ice-server heartbeat behaviour
|
2015-05-28 14:05:43 -07:00 |
|
Stephen Birarda
|
5c75863af4
|
immediately send add packet from DS for new node
|
2015-05-28 10:45:03 -07:00 |
|
Stephen Birarda
|
c7c542ef4c
|
decouple STUN from DS check in
|
2015-05-27 14:24:15 -07:00 |
|
Stephen Birarda
|
857552ae0b
|
don't hold back link event for account connect
|
2015-05-26 15:16:23 -07:00 |
|
Stephen Birarda
|
33545a0c3f
|
fix for domain-server settings account disconnect
|
2015-05-21 13:45:50 -07:00 |
|
Stephen Birarda
|
5d9f62066a
|
reload the merged config after making versioned changes
|
2015-05-21 10:27:24 -07:00 |
|
Stephen Birarda
|
4475ca4643
|
use new restricting access toggle for DS connection
|
2015-05-20 16:47:10 -07:00 |
|
Stephen Birarda
|
6306b69ec8
|
add a version and handle remapping for restricted access
|
2015-05-20 16:27:53 -07:00 |
|
Stephen Birarda
|
ac954e1c43
|
fix for lowercase help text in settings
|
2015-05-20 15:00:11 -07:00 |
|
Stephen Birarda
|
19b669867e
|
cleanup entity checkboxes for new format
|
2015-05-20 14:58:09 -07:00 |
|
Stephen Birarda
|
e295f52c0a
|
handle change event for new checkboxes
|
2015-05-20 14:52:31 -07:00 |
|
Stephen Birarda
|
ab52df7254
|
change checkboxes to prettier bootstrap switches
|
2015-05-20 14:30:50 -07:00 |
|
Stephen Birarda
|
227bdff07a
|
fix width of re-order column
|
2015-05-20 11:31:32 -07:00 |
|
Stephen Birarda
|
8fb5c53142
|
handle initial values for hash tables
|
2015-05-20 11:21:19 -07:00 |
|
Stephen Birarda
|
dff021ea15
|
fix for table creation on settings.js
|
2015-05-18 12:45:24 -07:00 |
|
Stephen Birarda
|
1a1b304319
|
update METAVERSE_URL to correct url
|
2015-05-18 10:24:10 -07:00 |
|
Stephen Birarda
|
6c5626da43
|
save input on enter or act on table
|
2015-05-18 10:19:11 -07:00 |
|
Stephen Birarda
|
bc0cb6105d
|
fix sidebar badging for grouped values
|
2015-05-15 17:28:37 -07:00 |
|
Stephen Birarda
|
23378a79ab
|
enable full auto networking for temporary name
|
2015-05-15 17:25:18 -07:00 |
|
Stephen Birarda
|
9024f15d25
|
show description for existing domain selection
|
2015-05-15 17:19:22 -07:00 |
|
Stephen Birarda
|
b8b5ff4aca
|
fixes for temporary domain creation
|
2015-05-15 17:14:51 -07:00 |
|
Stephen Birarda
|
edf9042ed5
|
add hifi link to table, make table icons anchors
|
2015-05-15 17:12:19 -07:00 |
|
Stephen Birarda
|
60a8dc1eb3
|
add initial version of places table in domain-server
|
2015-05-15 16:33:12 -07:00 |
|
Stephen Birarda
|
7caaa757fd
|
change paths label to places/paths
|
2015-05-15 14:51:53 -07:00 |
|
Stephen Birarda
|
bfa069a26b
|
handle domain ID removal and account disconnection
|
2015-05-15 13:15:09 -07:00 |
|
Stephen Birarda
|
a675b0a891
|
fix locked link button in settings
|
2015-05-15 13:10:32 -07:00 |
|
Stephen Birarda
|
82cb55e602
|
handle case where account is locked
|
2015-05-15 11:26:06 -07:00 |
|
Stephen Birarda
|
78fa82515a
|
use constant IDs for domain buttons
|
2015-05-15 11:19:44 -07:00 |
|
Stephen Birarda
|
c0473adec9
|
add button to create new domain ID in settings
|
2015-05-15 11:18:12 -07:00 |
|
Stephen Birarda
|
bb936657ae
|
handle domain creation during account connect flow
|
2015-05-15 11:09:00 -07:00 |
|
Stephen Birarda
|
c4f926b25f
|
hide domain ID + auto network options without account
|
2015-05-14 16:15:28 -07:00 |
|
Stephen Birarda
|
20940b55ba
|
handle access token storage via sweet-alert
|
2015-05-14 15:47:20 -07:00 |
|
Stephen Birarda
|
5645fdc8b9
|
send user to token creation page
|
2015-05-14 15:21:33 -07:00 |
|
Stephen Birarda
|
a668ea7a4c
|
remove a blank line
|
2015-05-14 12:53:23 -07:00 |
|
Stephen Birarda
|
4de006f9b9
|
handle OAuth access token retrieval
|
2015-05-14 12:22:23 -07:00 |
|
Stephen Birarda
|
fabe19a92c
|
ask for OAuth token directly
|
2015-05-14 11:19:07 -07:00 |
|
Stephen Birarda
|
aff83be768
|
handle account disconnection from DS settings
|
2015-05-14 11:03:41 -07:00 |
|
Stephen Birarda
|
033007cce6
|
use viewHelpers to create HF account button
|
2015-05-14 10:45:26 -07:00 |
|
Stephen Birarda
|
52ce9af375
|
fix updateSetting conditionals after merge
|
2015-05-13 17:53:21 -07:00 |
|
Stephen Birarda
|
62c0aff16a
|
handle falsy values returned from valueForKeyPath
|
2015-05-13 17:52:46 -07:00 |
|
Stephen Birarda
|
69fb6c73ac
|
remove gui only feature in domain-server
|
2015-05-13 17:33:44 -07:00 |
|
Stephen Birarda
|
93973eecd1
|
resolve conflicts on merge with upstream/master
|
2015-05-13 17:13:33 -07:00 |
|
Stephen Birarda
|
225b41d163
|
don't do dumb things with memory
|
2015-05-13 14:18:48 -07:00 |
|
Stephen Birarda
|
8b2ded1b79
|
handle case where QVariant is not QVariantMap
|
2015-05-13 13:16:06 -07:00 |
|
Stephen Birarda
|
e88cfc913f
|
make sure viewpoint is prepended with slash
|
2015-05-12 15:45:13 -07:00 |
|
Stephen Birarda
|
89cb3d66e4
|
make sure paths are prepended with a slash
|
2015-05-12 15:39:22 -07:00 |
|
Stephen Birarda
|
edadaea604
|
add help text for domain-server paths
|
2015-05-12 15:30:25 -07:00 |
|
Stephen Birarda
|
332601b91c
|
final fixes for path query from DS
|
2015-05-12 14:34:14 -07:00 |
|
Stephen Birarda
|
7330e5255d
|
handle path query response from DS in NL/AM
|
2015-05-12 13:48:41 -07:00 |
|
Stephen Birarda
|
993984134c
|
add the path to DS response for path query
|
2015-05-12 12:48:01 -07:00 |
|
Stephen Birarda
|
0562fee82a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths
|
2015-05-12 12:39:05 -07:00 |
|
Stephen Birarda
|
e0ccc986b1
|
add a method to DS to respond to path query
|
2015-05-12 12:29:09 -07:00 |
|
Stephen Birarda
|
c66bd9b1aa
|
complete addition of paths to DS settings
|
2015-05-12 11:58:55 -07:00 |
|
Stephen Birarda
|
3daabd262b
|
remove debugs from DSSettingsManager
|
2015-05-12 11:24:47 -07:00 |
|
Stephen Birarda
|
c49d73ea35
|
handle root key settings when updating
|
2015-05-12 10:25:11 -07:00 |
|
Stephen Birarda
|
f0aeaa1af8
|
handle sidebar badging for new root values
|
2015-05-11 18:07:33 -07:00 |
|
Stephen Birarda
|
542ce944ef
|
add paths, handling for non-grouped values
|
2015-05-11 17:44:35 -07:00 |
|
Stephen Birarda
|
c390dcb4dd
|
change button to disconnect if account connected
|
2015-05-11 14:10:44 -07:00 |
|
Stephen Birarda
|
55338a2b0f
|
refuse to update a setting if it is gui only
|
2015-05-11 13:49:35 -07:00 |
|
Stephen Birarda
|
5afb0792dc
|
don't return gui only values from DS settings json
|
2015-05-11 13:44:35 -07:00 |
|
Stephen Birarda
|
27f06e2d37
|
add button handling for describe settings
|
2015-05-11 13:32:09 -07:00 |
|
Stephen Birarda
|
e7433adc96
|
re-affix the DS settings sidebar
|
2015-05-11 11:29:32 -07:00 |
|
Stephen Birarda
|
979f33ade5
|
show an advanced toggle button in when xs
|
2015-05-11 11:26:45 -07:00 |
|
Stephen Birarda
|
e225443986
|
fix for table overflow in DS settings
|
2015-05-11 11:18:26 -07:00 |
|
Stephen Birarda
|
8c6715e4fc
|
resolve conflicts on merge with upstream/master
|
2015-05-11 11:10:22 -07:00 |
|
Stephen Birarda
|
ddb52348bc
|
don't force use of Settings to all QCoreApplication
|
2015-05-08 16:24:39 -07:00 |
|
Stephen Birarda
|
e3acf861ff
|
fix for unverified datagram writes
|
2015-05-07 14:07:14 -07:00 |
|
Stephen Birarda
|
6b3cf1ba4a
|
remove dependency of PacketHeaders on NodeList
|
2015-05-05 12:19:42 -07:00 |
|
Stephen Birarda
|
7b4522e950
|
nullify the current Highchart when modal closed
|
2015-05-01 16:21:05 -07:00 |
|
Stephen Birarda
|
99bddcc102
|
insert usernames to JSONBreakableMarshal interpolate map
|
2015-05-01 15:45:53 -07:00 |
|
Stephen Birarda
|
5936073425
|
get avatar-mixer settings from domain-server
|
2015-04-30 14:55:53 -07:00 |
|
Stephen Birarda
|
b50545f414
|
use symlink for DS resources, add AM bandwidth
|
2015-04-30 13:53:44 -07:00 |
|
Stephen Birarda
|
e8ee9e4b3a
|
try performing copy in PRE_BUILD for VS
|
2015-04-30 13:42:30 -07:00 |
|
Stephen Birarda
|
42c40a7164
|
attempt add of resources to executable sources
|
2015-04-30 13:32:25 -07:00 |
|
Stephen Birarda
|
f9ac918ff0
|
add macro to copy directory beside target
|
2015-04-30 13:10:59 -07:00 |
|
Stephen Birarda
|
38ae3afc82
|
add a macro for directory copying
|
2015-04-30 13:06:00 -07:00 |
|
Stephen Birarda
|
73da4828b1
|
fix the shift and width of stat highchart
|
2015-04-30 08:33:08 -07:00 |
|
Stephen Birarda
|
17c5d1e32a
|
complete highchart dynamic graph for numerical values
|
2015-04-29 20:07:00 -07:00 |
|
Stephen Birarda
|
781f45e488
|
pull the keypath for clicked value in stats javascript
|
2015-04-29 17:55:10 -07:00 |
|
Stephen Birarda
|
a39ee91233
|
add a keypath data attribute on stat values
|
2015-04-29 17:53:29 -07:00 |
|
Stephen Birarda
|
eda18318d8
|
add highcharts for graphing of numerical stat values
|
2015-04-29 17:35:03 -07:00 |
|
Stephen Birarda
|
40dfbada5d
|
cleanup styling in json.human.css
|
2015-04-29 16:38:12 -07:00 |
|
Stephen Birarda
|
cca13d6c96
|
add back stale state for stats
|
2015-04-29 16:35:07 -07:00 |
|
Stephen Birarda
|
ab4a140806
|
re-enable dynamic stat updates, styling fix
|
2015-04-29 16:25:40 -07:00 |
|