Ryan Huffman
393b55424f
Fix Create-new-domain-id not saving in DS settings
2017-11-08 11:37:22 -08:00
David Rowe
ebe5d51ee8
Label models.json.gz paths in server Content tab with operating system
2017-11-08 14:25:10 +13:00
Ryan Huffman
b1fe3699f9
Fix domain id getting set to empty when adding place name
2017-11-02 17:42:24 -07:00
John Conklin II
a4e6b2911d
Merge pull request #11734 from highfidelity/stable
...
Make sure RC-58 is up to date with stable
2017-11-02 16:39:27 -07:00
Ryan Huffman
8401aecef5
Update wizard to make request for domain info
2017-11-01 16:04:26 -07:00
Atlante45
7616fe193c
Migrate the DS config version to the config file
2017-10-31 17:35:23 -07:00
Stephen Birarda
b8370128ce
remove master config from HifiConfigVariantMap/domain-server
2017-10-31 16:19:50 -07:00
Stephen Birarda
05cfd72464
Merge pull request #11707 from Atlante45/feat/wizard
...
Domain Settings tweaks + Domain Setup Wizard
2017-10-30 08:39:31 -07:00
Ryan Huffman
70d3bd3672
Fix label/auto networking not being hidden for temp domains
2017-10-29 20:48:03 -07:00
Ryan Huffman
ed99541b5f
Fix domain info not loading for temp domains in DS settings
2017-10-29 20:47:52 -07:00
divya
de4fd269ef
Merge pull request #11701 from birarda/bug/local-ds-inconnect
...
only respond to expected ICE peers in DS
2017-10-28 21:23:05 -07:00
Atlante45
b0d838cb9b
Fix UNIX warning
2017-10-28 14:57:16 -07:00
Ryan Huffman
3616ef7c49
Fix ip-only in DS settings to show port instead of address
2017-10-28 14:19:14 -07:00
Ryan Huffman
88e22f7507
Remove unneeded logging in DomainServer.cpp
2017-10-28 14:19:14 -07:00
Atlante45
56e9a9aaf9
Handle old configs
2017-10-27 17:32:11 -07:00
Ryan Huffman
c42ef4f88c
Update most DS API forwarding APIs to use a single forwarding function
2017-10-27 15:53:50 -07:00
Atlante45
ae9f87873f
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard
2017-10-27 15:27:00 -07:00
Atlante45
c7b8d1114d
CR
2017-10-27 15:11:31 -07:00
Ryan Huffman
75e98dcef9
Cleanup style in DS js files
2017-10-27 14:55:50 -07:00
Atlante45
203a419f2a
Setup Wizard
2017-10-27 12:52:36 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Ryan Huffman
390dae3918
Fix DS settings sidebar moving incorrectly
2017-10-27 11:49:41 -07:00
Ryan Huffman
2944d76ef0
Update settings with auto domain creation and restart
2017-10-27 11:49:41 -07:00
Ryan Huffman
1bb778c21f
Fix label support in DS settings and add automatic domain generation:
2017-10-27 11:49:41 -07:00
Ryan Huffman
92aa66cdd7
Update domain settings to include domain info editing
2017-10-27 11:49:40 -07:00
Ryan Huffman
7dc475c695
Update domain server settings
...
Move requests that require access token to go through DS
Update various styling and ease of use on DS settings page
Update domain server settings
CP
CP
2017-10-27 11:49:34 -07:00
Stephen Birarda
10d05ba6c9
only respond to expected ICE peers in DS
2017-10-26 16:34:49 -07:00
Zach Fox
002141724b
Return to using NetworkingConstants
2017-10-26 14:12:36 -07:00
Zach Fox
d24f241b88
Fix silly javascript error
2017-10-26 13:31:15 -07:00
Stephen Birarda
9345f4545f
sanitize the ice-server addresses before using
2017-10-25 14:10:11 -07:00
Zach Fox
b092862b03
Missed another spot
2017-10-24 14:23:06 -07:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
Zach Fox
3f0b08aea8
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-18 10:37:47 -07:00
Zach Fox
eceb0dcc95
Fix appearance of domain settings page
2017-10-17 11:29:43 -07:00
Zach Fox
a4b8bf0be6
Bugfixes and CR
2017-10-16 15:33:10 -07:00
Mohammed Nafees
19b00e1364
Add option to limit assets filesize in settings
2017-10-11 19:59:04 -04:00
Zach Fox
8d887caa5d
Make min and max dynamic verification times server settings
2017-10-09 11:37:02 -07:00
Zach Fox
e5e6d84e07
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-06 09:47:21 -07:00
Zach Fox
b7e50c5b73
First steps
2017-10-03 14:36:22 -07:00
Liv
f150d77d31
Updating placeholder.js to use a url that points to example scripts
2017-10-02 11:08:07 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Stephen Birarda
57a92adc73
flag node as local by sending address, not by local from packet
2017-09-18 15:39:51 -07:00
Brad Hefta-Gaub
7cce45017b
Merge pull request #11244 from birarda/bug/ice-dns-fail
...
add a timeout for ICE server DNS lookup
2017-09-07 11:09:05 -07:00
Stephen Birarda
3003f64514
add debug for ice server lookup fail
2017-08-24 16:42:53 -07:00
Stephen Birarda
c7affea411
add a timeout for ICE server DNS lookup
2017-08-24 16:40:16 -07:00
Stephen Birarda
133b7e66b7
adjust a comment and remove some debug
2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc
add additional IP check to DS packet filter operator
2017-08-23 15:32:25 -07:00
Liv
b63fcc329e
localhost default can change settings
2017-08-07 17:28:49 -07:00
Liv
d2abc42e8f
Update domain server to include permissions
2017-08-07 12:43:54 -07:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Liv
eb1b7e52df
restore original files that had erroneous whitespace changes to reduce diff
2017-07-26 09:00:51 -07:00
Stephen Birarda
dd3755596c
fix typo in comment in DomainGatekeeper header
2017-07-25 15:43:34 -07:00
Stephen Birarda
e9845784d5
don't return error decrypting for optimistic public keys
2017-07-25 15:28:05 -07:00
Stephen Birarda
2d0c5ff37a
remove preloading of allowed user keys since it happens on connect
2017-07-25 11:41:34 -07:00
Liv
9458e4a1eb
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-07-25 11:32:13 -07:00
utkarshgautamnyu
5771ee27e1
Update DomainGatekeeper.cpp
2017-07-24 17:33:01 -07:00
utkarshgautamnyu
884bdb3b7e
Update DomainGatekeeper.cpp
2017-07-24 14:57:22 -07:00
utkarshgautamnyu
7c62ed6dac
made sendRequest depend on hasValidAccessToken being true
2017-07-24 14:46:32 -07:00
Liv
4ba9b08125
first attempt at url handling in octree server
2017-07-20 14:00:51 -07:00
Liv
e0fd391766
Add permission level for replacing domain content
2017-07-18 14:34:22 -07:00
Liv
3712e14530
Surface new user group UI to domain server settings
2017-07-18 10:02:46 -07:00
Stephen Birarda
d22b146370
Merge pull request #10845 from birarda/bug/domain-cookie-restart
...
fix for OAuth OPTIONS firing every XHR 302
2017-07-06 17:22:03 -07:00
Stephen Birarda
6d98d20b12
cleanup bad QEventLoop::exec() OAuth handling code
2017-07-06 16:19:47 -07:00
utkarshgautamnyu
d961a0c4ad
Merge pull request #10887 from highfidelity/bug/5950
...
Bug/5950
2017-07-06 14:04:38 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
utkarshgautamnyu
d5c88bc6de
Merge branch 'master' into bug/5950
2017-07-06 12:52:13 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
utkarshgautamnyu
9d2fe8da9c
Update DomainServer.cpp
2017-07-05 18:02:44 -07:00
utkarshgautamnyu
8c96d00f14
Update DomainServerSettingsManager.cpp
2017-07-05 16:59:47 -07:00
utkarshgautamnyu
9b7a561c28
Update describe-settings.json
2017-07-05 16:56:21 -07:00
utkarshgautamnyu
f824290a4c
Update describe-settings.json
2017-07-05 14:38:06 -07:00
utkarshgautamnyu
25773fcf5a
Update describe-settings.json
2017-07-05 14:36:17 -07:00
utkarshgautamnyu
872751bb16
Update describe-settings.json
2017-07-05 14:30:48 -07:00
utkarshgautamnyu
c069c13ebb
Update DomainServerSettingsManager.cpp
2017-07-05 14:12:18 -07:00
utkarshgautamnyu
1385ef80a7
Update DomainServerSettingsManager.cpp
2017-07-05 13:56:40 -07:00
utkarshgautamnyu
7b79e8c41e
Update describe-settings.json
2017-07-05 13:53:04 -07:00
Clément Brisset
8744b8e58d
Merge pull request #10859 from Atlante45/fix/ac-cleanup
...
Fix AC cleanup
2017-06-30 16:42:15 -07:00
Atlante45
5c731636b1
Sandbox restarts crashed processes
2017-06-29 12:13:52 -07:00
utkarshgautamnyu
5f123018a4
Update DomainMetadata.cpp
2017-06-29 10:38:33 -07:00
Stephen Birarda
cf92144748
fix for OAuth OPTIONS firing on XHR 302
2017-06-28 14:13:09 -07:00
Stephen Birarda
86eb5b14ca
disable the user activity logger in DS/AC/ac-client
2017-06-28 13:19:58 -07:00
Seth Alves
5e2aeb96d3
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
2017-06-23 10:18:33 -07:00
Seth Alves
8510b60a87
Merge pull request #10789 from sethalves/fix-domain-server-ice-messages
...
fix the messages printed by domain-server about which name it's using to find ice-servers
2017-06-22 17:59:09 -07:00
Clément Brisset
c47645e075
Merge pull request #10778 from birarda/feat/upstream-in-nodelist
...
add upstream nodes to NL and verify replicated packet sender
2017-06-22 15:16:23 -07:00
Stephen Birarda
07ccf13ca9
Merge pull request #10788 from seefo/fb5533
...
Fixed a bug where restart modal was shown when it shouldn't be
2017-06-22 14:44:19 -07:00
seefo
517329030f
Merge pull request #10787 from seefo/fb5520
...
Added confirmation to domain server webpage before restarting
2017-06-22 14:20:35 -07:00
Seth Alves
d290f03edb
Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan
2017-06-22 13:53:23 -07:00
Seth Alves
f1c7d54010
fix the messages printed by domain-server about which name it's using to find ice-servers
2017-06-22 13:53:06 -07:00
seefo
d87a55d6e6
Made requested change to DS restart dialog message
2017-06-22 13:52:34 -07:00
Stephen Birarda
0c7baa3ce4
remove an extra blank line
2017-06-22 13:36:58 -07:00
Stephen Birarda
dd44a81791
verify that replication server type is also present
2017-06-22 13:36:24 -07:00
seefo
d340c1c68f
Fixed a bug where restart modal was shown when it shouldn't be
2017-06-22 13:35:10 -07:00
Stephen Birarda
e00bbfb2fd
make upstream nodes setting advanced
2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee
send upstream nodes down to avatar/audio
2017-06-22 13:33:57 -07:00
seefo
48b5989b60
add upstream nodes to domain nodelist
2017-06-22 13:33:57 -07:00
seefo
71cc76e94f
Renamed upstream servers setting in domain server
2017-06-22 13:33:31 -07:00
seefo
7eed90bf54
Added Upstream Servers setting to domain server
2017-06-22 13:33:31 -07:00
seefo
d834a05fd9
Added confirmation to domain server webpage before restarting
2017-06-22 13:27:43 -07:00
Stephen Birarda
01d9812247
Merge pull request #10772 from birarda/bug/domain-double-connect
...
use existing node ID during repeated connect requests
2017-06-22 13:16:33 -07:00
Seth Alves
7ff576ef18
add memory-debugging macro to some cmake files
2017-06-22 10:07:39 -07:00
Stephen Birarda
95704c1ba5
make broadcasting settings advanced
2017-06-21 17:58:19 -07:00
Stephen Birarda
c516dd06e4
Merge pull request #10714 from highfidelity/replicants
...
add broadcasting/replication to downstream avatar mixers and audio mixers
2017-06-21 17:55:07 -07:00
Stephen Birarda
e39e5c8c3b
simplify lambda capture in gate keeper
2017-06-21 16:21:40 -07:00
Stephen Birarda
aeb3f443f8
address code review comments
2017-06-21 16:14:14 -07:00
Stephen Birarda
9285c88e46
check if usernames do not match before using hint ID
2017-06-21 15:34:43 -07:00
Stephen Birarda
3e97b07fc2
Revert "force domain-server to use new ID if node requests connect"
...
This reverts commit cd023e0384
2017-06-21 15:14:16 -07:00
Stephen Birarda
3619294761
Merge pull request #10745 from seefo/fb5367
...
Added a restart button to domain server settings page
2017-06-19 16:35:36 -07:00
seefo
0c7f1cda0f
Added a restart button to domain server settings page
2017-06-19 15:01:50 -07:00
seefo
1619d877d3
Made requested changes to domain server settings.js
2017-06-19 13:21:13 -07:00
seefo
705ce4c789
Changed domain server restart/save button behavior to be correct
2017-06-19 12:09:20 -07:00
seefo
3d4b9c82aa
Changed indentation to be consistent
2017-06-19 11:56:45 -07:00
seefo
3224bf5af0
Domain server settings will now tell user if saving will restart DS
2017-06-19 11:52:49 -07:00
Stephen Birarda
36b4990114
fix for table additions when there is no initial row
2017-06-15 17:19:05 -07:00
Stephen Birarda
e6ef153148
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants
2017-06-15 15:43:13 -07:00
Stephen Birarda
0565cfa2b7
fix for array additions in DS settings
2017-06-15 14:59:12 -07:00
Stephen Birarda
ea6a38148c
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-15 14:30:08 -07:00
Ryan Huffman
330a27b3a0
Fix removing all downstream nodes in settings not killing nodes
2017-06-15 14:27:01 -07:00
Stephen Birarda
94abfc2d6b
nomenclature changes from replication to broadcast
2017-06-15 11:47:13 -07:00
Brad Hefta-Gaub
035a9e898f
Merge pull request #10684 from howard-stearns/avatar-whitelist
...
avatar whitelist
2017-06-15 08:45:16 -07:00
Stephen Birarda
2e5d92a537
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-14 17:23:12 -07:00
Stephen Birarda
0fa88db1d3
Merge pull request #10699 from seefo/replicants
...
Fixed default value bug in dropdowns inside domain server settings
2017-06-14 17:22:55 -07:00
Stephen Birarda
10649c8f6e
change new Node flag to isForcedNeverSilent
2017-06-14 17:20:37 -07:00
seefo
0fa172a4ef
Fixed default value bug in dropdowns inside domain server settings
2017-06-14 17:19:48 -07:00
Stephen Birarda
224a559602
keep downstream nodes around in domain, alive in upstream
2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f
Move downstram server adding to DS
2017-06-14 16:54:04 -07:00
Stephen Birarda
e818a511b9
cleanup debug in updateReplicatedNodes
2017-06-14 15:07:48 -07:00
Stephen Birarda
54832d995d
fix a typo in shouldReplicateNode
2017-06-14 15:05:58 -07:00
Ryan Huffman
67113330b3
Make replicated username list case insensitive
2017-06-14 15:03:54 -07:00
Ryan Huffman
8d5dc21de8
Fix replicated nodes not being properly updated when logging in or changing settings
2017-06-14 15:03:53 -07:00
Clément Brisset
44117ac001
Merge pull request #10694 from highfidelity/master
...
Update replicants branch with master
2017-06-14 15:01:22 -07:00
Ryan Huffman
7f75a5f7f5
Make replicated username list case insensitive
2017-06-14 13:57:04 -07:00
Ryan Huffman
59a420a358
Fix replicated nodes not being properly updated when logging in or changing settings
2017-06-14 13:53:50 -07:00
howard-stearns
2deb26551f
typos in comments/help-strings
2017-06-14 11:56:47 -07:00
seefo
2d9e92d121
Made requested changes to PR10683
2017-06-13 18:08:26 -07:00
seefo
4080814df8
Cleaned up dropdown support for tables
2017-06-13 18:07:16 -07:00
seefo
2f307f418c
Added support for dropdown to tables in domain settings
2017-06-13 18:07:16 -07:00
seefo
74066647c6
Resolved FB4958
2017-06-13 18:01:53 -07:00
Ryan Huffman
029e6de2a0
Fix replicated users not being checked after username verified
2017-06-13 17:18:29 -07:00
Ryan Huffman
2e23230e82
Remove DomainServer qualification inside header
2017-06-13 17:18:29 -07:00
Ryan Huffman
ea56c568a7
Add support for replicating by username
2017-06-13 17:18:28 -07:00
howard-stearns
6271b8ee7c
avatar whitelist
2017-06-13 16:56:18 -07:00
Stephen Birarda
7bfce55559
Merge pull request #10667 from seefo/fb5284
...
Added initial replication settings to domain settings
2017-06-12 16:28:41 -07:00
seefo
6635187da3
Changed domain server settings
2017-06-12 16:13:03 -07:00
Ryan Huffman
84e1a6f893
Rename isReplicant to isReplicated
2017-06-12 13:38:58 -07:00
Ryan Huffman
ff2800e8d5
Add isReplicant to Node
2017-06-12 13:37:49 -07:00
seefo
2ce924377a
Added initial settings for replication
2017-06-12 11:56:38 -07:00
seefo
110a2f5d03
Resolved FB#4399
2017-06-08 10:35:50 -07:00
seefo
da41b5dc00
Focus is now changed when adding a new list item in DS settings
2017-05-25 09:20:04 -07:00
seefo
cb831733a1
Added warning if trying to change DS HTTP password to blank string
2017-05-23 17:07:37 -07:00
seefo
8a8f971186
empty passwords will no longer allow any password to pass DS HTTP auth
2017-05-23 12:01:00 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Stephen Birarda
a21a34a4a4
add entities file replacement to DS and ES
2017-04-27 16:56:27 -07:00
Stephen Birarda
cd023e0384
force domain-server to use new ID if node requests connect
2017-04-25 13:10:54 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Brad Davis
4367e3d036
PR comments
2017-03-15 18:13:10 -07:00
Brad Davis
2837ae9183
More VS 2017/2015 fixes
2017-03-15 16:13:15 -07:00
Zach Pomerantz
808973d7d2
use QStandardPaths instead of hardcoded paths
2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0
move resource paths to PathUtils
2017-03-13 17:26:34 -04:00
kunalgosar
a4e0d970bf
Fix security section of domain server
2017-02-24 19:03:30 -08:00
Brad Hefta-Gaub
305e1ae1d2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-17 10:18:53 -08:00
David Kelly
a8831e89ff
Ban only by machine fingerprint, when possible
2017-02-16 09:50:56 -07:00
Brad Hefta-Gaub
5d90b7b1b7
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-15 16:15:57 -08:00
Howard Stearns
34a4770ffa
Merge pull request #9669 from davidkelly/dk/2656
...
inform gatekeeper immediately when kicking someone
2017-02-15 15:13:10 -08:00
Brad Hefta-Gaub
00086fcc06
wire up thread count to settings, tweak stats
2017-02-15 13:00:30 -08:00
Stephen Birarda
27412080dd
return an empty descriptors map when empty
2017-02-14 15:39:59 -08:00
David Kelly
3b344ca01a
inform gatekeeper immediately when kicking someone
2017-02-13 18:25:00 -07:00
David Kelly
45cb11f38a
Don't allow a ban of any node on same machine as domain-server
2017-02-13 14:38:21 -07:00
Ryan Huffman
026c68c7de
Merge pull request #9625 from huffman/fix/server-script-entity-updates
...
Fix Server Entity Script w/ high update rate causing issues
2017-02-09 10:07:32 -08:00
Ryan Huffman
f75eceda65
Add entity PPS per script configuration
2017-02-08 13:11:18 -08:00
Stephen Birarda
5c46cecf6a
handle empty initial groups when comparing
2017-02-06 14:32:02 -08:00
Stephen Birarda
3311df5e1f
fix default value in new row
2017-02-06 14:23:37 -08:00
Stephen Birarda
4bbd823a5a
remove open hours from domain settings
2017-02-06 10:50:59 -08:00
Stephen Birarda
5bd8e46510
only check if keys are empty, not all fields
2017-02-01 10:33:29 -08:00
Stephen Birarda
f03d2988c1
fix for checkbox name setting
2017-01-31 17:30:45 -08:00
Stephen Birarda
79cb0ba074
fix keyboard behaviour for category tables
2017-01-31 11:05:57 -08:00
Stephen Birarda
1474f22fd7
don't validate category inputs for empty
2017-01-31 10:55:42 -08:00
Stephen Birarda
015aafe0fb
make table additions in DS settings clearer
2017-01-31 10:36:16 -08:00
David Kelly
eaf033107c
Require password verification in domain-server settings
...
If you modify the security settings to use a username/password for
access to the domain server settings, we now have a second password
field which must match the first one you entered.
2017-01-30 17:13:13 -07:00
Howard Stearns
866f9debcd
Merge pull request #9526 from highfidelity/edit-entity-filter
...
Edit entity filter (from branch)
2017-01-26 16:00:48 -08:00
Brad Hefta-Gaub
0582aca598
Merge pull request #9511 from kunalgosar/master
...
change server to default to not auto-muting
2017-01-26 10:59:50 -08:00
howard-stearns
1c30da42af
change placeholder text in settings
2017-01-25 17:01:07 -08:00
howard-stearns
9cbc4fd1b9
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource
2017-01-25 16:23:52 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
kunalgosar
7b896f961b
change server to default to not auto-muting
2017-01-25 13:00:57 -08:00
Ryan Downe Karpf
b053fb55aa
Merge pull request #9478 from birarda/bug/too-many-casts
...
some reinterpret/dynamic cast cleanup in domain-server
2017-01-25 12:47:27 -08:00
Stephen Birarda
9b8cbba53f
add isInInterestSet to DomainServer for extra checks
2017-01-24 18:32:33 -08:00
Stephen Birarda
e511b6e84c
cleanup connect check in DomainServer
2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94
don't tell ESS about script Agents that won't talk to it
2017-01-24 17:10:05 -08:00
Stephen Birarda
7362bf16c1
use isParentOf to check script whitelist, clarify description in settings
2017-01-23 16:44:28 -08:00
Stephen Birarda
1802e1520d
change some dynamic_cast to static_cast for DomainServerNodeData
2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb
fix needless reinterpret_cast for DomainServerNodeData
2017-01-23 13:14:53 -08:00
howard-stearns
3358d58d01
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-23 12:21:32 -08:00
Stephen Birarda
ab7ce19211
use html_id for settings anchor if no name
2017-01-23 09:49:46 -08:00
Ryan Huffman
b6893a0100
Keep Agents and EntityScriptServers from connecting if lacking permissions
2017-01-19 14:35:27 -08:00
Zach Fox
44eaa64a1d
It was writeString() all along!
2017-01-19 11:25:17 -08:00
Zach Fox
534fcd9399
Potential fix
2017-01-19 10:20:36 -08:00
Zach Fox
1175752e1d
Cleanup after rebase
2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02
First checkpoint
2017-01-18 12:55:24 -08:00
howard-stearns
d9182cd38d
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-18 10:02:27 -08:00
Atlante45
529286b2ea
More EntityScriptServer work
2017-01-17 13:47:45 -08:00
Atlante45
163d65d784
Setup basic EntityScriptServer
2017-01-17 13:47:45 -08:00
ZappoMan
5e49e8025a
improve comment in domain settings
2017-01-16 21:06:38 -06:00
Zach Fox
e22c1ac30e
Fix the bug
2017-01-16 11:48:51 -08:00
howard-stearns
f6446c6806
minimum entity edit filter
2017-01-13 13:18:24 -08:00
David Kelly
36792e005a
initial commit
2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a
Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS
...
Adding Machine Fingerprint to Domain Server permissions
2016-12-19 11:49:33 -08:00
Zach Fox
4bfc04a6ec
Small CR changes
2016-12-19 10:41:18 -08:00
Zach Fox
ee2f600d2e
Fix username display bug
2016-12-19 10:20:08 -08:00
Zach Fox
a912fec496
PR comments; need particular fix on Master for full QA
2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
802e283508
Another checkpoint, getting closer
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
Brad Davis
2d73588361
Fix stat tracker missing in agents
2016-12-16 17:34:00 -08:00
David Kelly
0553dbdcb7
CR feedback
2016-12-16 17:17:10 -08:00
David Kelly
126ae52cb4
Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS
2016-12-16 12:17:54 -08:00
David Kelly
4d7f3051a7
Expose Machine Fingerprint perms in DS settings page
...
Should be about same as MAC or IP for now, applies whenever you are not
logged in.
2016-12-16 10:19:37 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
David Kelly
cb14b0e3e0
inital cut, passing fingerprint in
...
does permissions same as mac address, more or less. Not exposed
yet, just a beginning.
2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub
92632e72b6
make default avatar mixer send bandwidth 5mbps
2016-12-13 17:04:25 -08:00
Zach Pomerantz
f5b4fac46d
set default audio threads to 1
2016-12-07 18:47:33 -05:00
Zach Pomerantz
b4638105e3
expose audio mixer threads to gui
2016-11-29 13:32:10 -05:00
Atlante45
3035d43772
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-21 13:05:08 -08:00
Stephen Birarda
dec4ce79b2
fix comment in mac permission unpack
2016-11-18 14:42:29 -08:00
Stephen Birarda
143225a74c
add MAC permission table to domain-server and leverage
2016-11-18 14:40:22 -08:00
Stephen Birarda
47f82a8046
send the mac address with domain-server check in
2016-11-18 13:50:11 -08:00
Stephen Birarda
39afb24982
explictly remove Agent from NIS for other Agents
2016-11-15 10:37:19 -08:00
Stephen Birarda
1791a1c1fe
never send agents to other agents
2016-11-15 10:15:17 -08:00
Chris Collins
6581a51bc9
Merge pull request #9052 from davidkelly/dk/2226
...
Add ability to mute user
2016-11-11 16:02:08 -08:00
Clément Brisset
e38da75115
Merge pull request #9053 from huffman/feat/whitelist-ac-ip
...
Add AC ip address whitelist to domain server
2016-11-11 15:03:21 -08:00
Ryan Huffman
528b8e93f0
Remove extraneous logging in DomainServer for whitelist
2016-11-11 14:33:34 -08:00
Ryan Huffman
fc1a7255f6
Remove unneeded 'this->'
2016-11-11 14:24:28 -08:00
Ryan Huffman
e177004d71
Fix ds not restarting when changing ac whitelist
2016-11-11 14:23:16 -08:00
Ryan Huffman
d522d03bd2
Add repeated message suppression to request assignment packets
2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4
whitespace
2016-11-11 11:24:06 -08:00
Ryan Huffman
969cbf4cb0
Update domain server subnet whitelist description
2016-11-11 10:46:40 -08:00
Ryan Huffman
bd1bcaf1a4
Clean up subnet whitelist implementation
2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302
Update naming for subnet whitelist in ds
2016-11-11 10:32:45 -08:00
Ryan Huffman
ca6a74d63d
Add whitelist filtering to assignment requests
2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca
Add ip address whitelist processing to domain server
2016-11-11 10:19:21 -08:00
Ryan Huffman
edb8d14507
Add ac address whitelist to domain server settings
2016-11-11 10:18:16 -08:00
David Kelly
9c8f22e0e7
straight to audio mixer
...
since we can get the canKick there too. (doh)
2016-11-11 09:30:58 -08:00
Stephen Birarda
7f46714645
drop the incorrect scale from domain settings
2016-11-10 16:53:56 -08:00
David Kelly
285520dff7
Initial cut
...
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08:00
Stephen Birarda
f14037979a
fix a typo in help text for minimum scale
2016-11-10 15:31:23 -08:00
Stephen Birarda
6f442a74b1
request settings from agents and debug results
2016-11-10 14:43:15 -08:00
Stephen Birarda
77ede81fc9
limit MyAvatar scale to limits from domain settings
2016-11-10 13:27:13 -08:00
Stephen Birarda
563322d08d
add min and max avatar scale to domain-server settings
2016-11-10 10:04:01 -08:00
Brad Hefta-Gaub
8758e4a9ba
add support for whitelist entity scripts
2016-11-09 19:17:24 -08:00
Atlante45
ae29fe8ab2
Logging improvements
2016-11-04 14:26:19 -07:00
humbletim
bf93483f87
allow assignment client scripts to create ATP assets
2016-10-26 11:22:33 -04:00
Stephen Birarda
3c7bcf1127
remove the max bandwidth option from DS settings while broken
2016-10-18 15:54:25 -07:00
Stephen Birarda
5562d7e7a6
add a filter operator to decide if connections are created
2016-10-14 14:46:58 -07:00
Ryan Downe Karpf
397816679d
Merge pull request #8790 from huffman/feat/reliable-path-queries
...
Update ds path queries to be reliable
2016-10-13 09:21:44 -07:00
Ryan Huffman
a44653db57
Update ds path queries to be reliable
2016-10-12 10:47:42 -07:00
Atlante45
5bae69bb51
Fix DS
2016-10-12 10:20:19 -07:00
Atlante45
d5429e76da
Warnings fixes and cleanup
2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f
Switch to JSON for application settings
2016-10-12 10:20:19 -07:00
Seth Alves
e9961110e9
if we have new ice-server information, retry right away, even if the previous attempt failed
2016-10-10 15:40:59 -07:00
Seth Alves
9712301172
avoid a race that can cause metaverse to not have correct ice-server information about a domain
2016-10-10 11:54:33 -07:00
Brad Hefta-Gaub
41e90eda49
Merge pull request #8648 from sethalves/no-groups-no-log-spam
...
don't check for user membership in a null list of groups
2016-09-30 11:23:30 -07:00
Thijs Wenker
7e3073e163
fix spelling bugs
2016-09-29 22:13:27 +02:00
Chris Collins
5f325f7923
Merge pull request #8629 from sethalves/ice-troubles-1
...
domain-server tells metaverse if it has no ice-server
2016-09-23 15:26:50 -07:00
Seth Alves
8cadd299a2
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1
2016-09-23 13:16:26 -07:00
Zach Pomerantz
a9318d052b
Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config
2016-09-23 13:11:52 -07:00
Seth Alves
f546524c1f
don't checkout for user membership in a null list of groups
2016-09-23 09:46:10 -07:00
Seth Alves
bd2ee56a27
fix domain-server command-line arguments
2016-09-22 12:45:49 -07:00
Seth Alves
d2c5378627
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1
2016-09-22 11:44:23 -07:00
Seth Alves
c43c83019d
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub
5d3d4bdbd9
add support for redirection on domain at max capacity
2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3
strip unused audio settings
...
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Seth Alves
7dc8a48dba
Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles-1
2016-09-21 10:08:17 -07:00
Seth Alves
b9ea93de57
use qWarning rather than qCritical because qCritical may exit
2016-09-21 10:08:02 -07:00
Seth Alves
a3aea774fe
tell metaverse ice-server is 0.0.0.0 when domain-server doesn't have one
2016-09-21 10:07:12 -07:00
Seth Alves
ba8aa5b50c
fix camelcase
2016-09-19 16:38:34 -07:00
Seth Alves
571aaac4d7
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
2016-09-19 15:37:53 -07:00
Seth Alves
8108557e10
whitespace
2016-09-19 15:37:50 -07:00
Brad Hefta-Gaub
fd474f6319
add basic support for master vs stable builds
2016-09-19 14:14:32 -07:00
Seth Alves
45b48c01bf
command-line arguments to control ice-server ip address and domain-server ID
2016-09-19 13:39:42 -07:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
SamGondelman
544606bccc
cmake fix
2016-09-06 17:40:44 -07:00
SamGondelman
74e5814a48
try to fix rpath issue
2016-09-06 17:40:43 -07:00
SamGondelman
9d447d4dcc
enabled qnetworkrequest redirects everywhere I could find them
2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd
Use invalid port to signal no value passed
2016-09-06 11:59:07 -07:00
Stephen Birarda
43b8e01d46
don't force auto networking on non metaverse domains
2016-08-23 11:21:15 -07:00
Stephen Birarda
d098a1ae28
allow temporary domains to use an access token when present
2016-08-22 10:50:39 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Seth Alves
ac4ecc9907
don't send a login-denied packet when we're still waiting for user's public key.
2016-08-19 14:10:27 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Ryan Huffman
727d59ab27
Add backup directory setting to domain server
2016-08-16 17:33:32 -07:00
Stephen Birarda
5bac88c004
default domain-server permissions to connect for standard
2016-08-11 10:52:36 -07:00
Zander Otavka
3df8aa0dba
Suppress repeated ice server connection messages
2016-08-08 17:01:32 -07:00
Seth Alves
f348b56106
remove hidden attribute from advanced settings button
2016-08-05 18:16:48 -07:00
Brad Hefta-Gaub
652bea8cd0
Merge pull request #8363 from birarda/no-temp-ice-update
...
Avoid DS heartbeats with non-metaverse domain ID
2016-08-05 16:48:00 -07:00
Seth Alves
3ca1ee1d82
Fix some group-related code to handle CamelCase usernames
2016-08-04 17:39:41 -07:00
Stephen Birarda
f3e30221f0
only force a new temp name if already a temp domain-server
2016-08-04 09:33:31 -07:00
Stephen Birarda
ba49fd2c61
don't heartbeat immediately unless metaverse domain
2016-08-04 09:33:31 -07:00
Stephen Birarda
a1220b87f1
set key ID for verified user in right place
2016-08-02 14:35:51 -07:00
