Stephen Birarda
4bb8435ef8
don't overwrite general description object with filtered one
2018-02-15 19:18:22 -08:00
Stephen Birarda
81662b5edc
don't overwrite general description object with filtered one
2018-02-15 19:14:14 -08:00
Atlante45
b30f98d541
CR
2018-02-15 18:20:14 -08:00
Atlante45
697f0c443c
Fix warning
2018-02-15 17:43:02 -08:00
Atlante45
2b85634a21
Fix build error
2018-02-15 17:03:55 -08:00
Atlante45
cae3e0a9dc
Add status func to ContentSettingsBackupHandler
2018-02-15 17:00:24 -08:00
Atlante45
771e4cd9f4
Hook up status and progress
2018-02-15 16:48:21 -08:00
Atlante45
57410e4f1c
Remove ES restart after restore
2018-02-15 16:48:21 -08:00
Atlante45
b76e1b9750
Add backup status getters
2018-02-15 16:48:21 -08:00
Atlante45
a7ca539899
Simplify BackupHandler pattern
2018-02-15 16:48:21 -08:00
Ryan Huffman
1120b12b8c
Fix argument to isAvailable
2018-02-15 16:47:48 -08:00
Ryan Huffman
2942a53a1d
Add recovery mode and full backup information to DS
2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f
Add backup download API to DS
2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744
Add restart of ES during backup recovery
2018-02-15 16:47:23 -08:00
Stephen Birarda
e71f2fa387
use QtHelpers macro for blocking invoke
2018-02-15 16:03:03 -08:00
Stephen Birarda
e06c95f586
make settings manager methods used for backup/restore thread safe
2018-02-15 15:55:13 -08:00
Stephen Birarda
f5cad5683d
make sure backup handlers end up on the correct thread
2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464
add a content settings backup handler
2018-02-15 15:10:51 -08:00
Atlante45
3297e39c14
CR
2018-02-15 13:39:18 -08:00
Atlante45
d6e2814081
Write assets to disk when recovering full backup
2018-02-15 11:28:52 -08:00
Atlante45
9fca92facd
Move EntitiesBackupHandler to its own file
2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045
Rename backup supervisor
2018-02-15 11:27:21 -08:00
Atlante45
4482f9c83c
Queue all requests until the AS is fully setup
2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4
Simplify BackupHandler pattern
2018-02-15 11:27:20 -08:00
Ryan Huffman
efb2473fcf
Updaet createManualBackup to defer response until creation is done
2018-02-15 11:02:55 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Ryan Huffman
df809f5a3e
Cleanup logging for backup cleanup
2018-02-15 11:02:29 -08:00
Ryan Huffman
4b2e907ada
Update entities recover backup to reset id and version
2018-02-15 11:02:14 -08:00
Ryan Huffman
1aba89b908
Fix style of init list
2018-02-15 10:22:35 -08:00
Ryan Huffman
b832e118cc
Add 'override' to BackupHandler methods
2018-02-15 10:22:35 -08:00
Ryan Huffman
f2b6823748
Fix initializer in EntitiesBackupHandler
2018-02-15 10:22:35 -08:00
Ryan Huffman
b6240e8622
Move backup recover API to POST
2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec
CR
2018-02-15 10:22:35 -08:00
Ryan Huffman
80b03b9046
Make backup directory in content manager const
2018-02-15 10:22:35 -08:00
Ryan Huffman
dd398da2e0
Update DS to use promises for backup APIs
2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f
Add backup DS APIs
...
Add backup apis
2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80
Add BackupHandler for entity file backups
2018-02-15 10:22:35 -08:00
Atlante45
69298246c4
CR
2018-02-15 10:09:21 -08:00
Atlante45
d4b4c55673
Remove unecessary debug
2018-02-15 10:09:21 -08:00
Atlante45
c41ad1a699
Add consolidate
2018-02-15 10:09:21 -08:00
Atlante45
a6447da64c
More Asset Backup work
2018-02-15 10:09:21 -08:00
Atlante45
11b7fb89a9
Integrate new backup systems
2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd
Fix replacement octree data not working
2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
ff5be2d690
Fix entity data ID sometimes being reset
2018-02-15 10:09:20 -08:00
Ryan Huffman
fc8e7a0841
Add target_zlib to DS CMakeLists.txt
2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
Stephen Birarda
4d4b42848b
add alert for moved content settings
2018-02-14 16:31:28 -08:00
Stephen Birarda
37b8fa2c0c
put back default values in settings response
2018-02-14 12:09:57 -08:00
Stephen Birarda
3516a8939a
flag settings in description as being excluded from backups
2018-02-14 12:09:57 -08:00
Stephen Birarda
9f2015ba46
check correct element to determine if restart is required
2018-02-14 12:09:57 -08:00
Stephen Birarda
09c2390db4
change backup file name, fix safari button click bug
2018-02-14 12:09:57 -08:00
Stephen Birarda
11fe279f6f
add domain settings backup and restore to web interface
2018-02-14 12:09:57 -08:00
Stephen Birarda
2f6b079d80
quick re-organization of settings groups
2018-02-14 12:09:57 -08:00
Stephen Birarda
0ace92798d
repair 2.1 settings migration code for avatar height
2018-02-14 12:09:57 -08:00
Stephen Birarda
bb2df1eb37
rename entity server section to remove settings
2018-02-14 12:09:57 -08:00
Stephen Birarda
3969288996
re-hide advanced settings and show with collapsible
2018-02-14 12:09:57 -08:00
Stephen Birarda
b650753e43
hide confusing label from domain settings for now
2018-02-14 12:09:57 -08:00
Stephen Birarda
6e93eb5dfa
update SVG icon for HMD with new colour
2018-02-14 12:09:57 -08:00
Stephen Birarda
2c2a6d5c60
add the empty label group to domain extra groups
2018-02-14 12:09:57 -08:00
Stephen Birarda
8c924ea106
update badge colour
2018-02-14 12:09:57 -08:00
Stephen Birarda
b0967dfc3a
move some more settings to content, leave places in domain settings
2018-02-14 12:09:57 -08:00
Stephen Birarda
6240181474
initial separation of content settings and domain settings
2018-02-14 12:09:56 -08:00
Atlante45
e15ab2ca6c
CR
2018-02-12 13:32:48 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Atlante45
46449256ce
CR
2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257
Asset Server Backup
2018-02-09 11:32:42 -08:00
Stephen Birarda
7a21ae8d89
re-send a connection token packet if the current one is null
2018-02-02 15:25:43 -08:00
Stephen Birarda
98d581acd1
fix debug lines in DomainGatekeeper with extra parens
2018-02-02 13:47:48 -08:00
Atlante45
314c51ab3b
Fix settings init in all exe
2018-01-26 15:53:08 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Anthony J. Thibault
d1609fb964
domain-server warning fix
2017-11-28 17:48:34 -08:00
Stephen Birarda
e2082c0bcf
apply machine fingerprint permissions if username absent
2017-11-27 19:02:40 -08:00
Stephen Birarda
8978254037
kick logged in by fingerprint/ip if enabled in DS settings
2017-11-27 18:23:14 -08:00
Atlante45
b398e235a2
Add tmpRezCertified to default perms
2017-11-22 13:40:44 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
Brad Hefta-Gaub
0945c1c50b
Merge pull request #11851 from Atlante45/feat/wizard
...
Reworked wizard congratulation page.
2017-11-21 09:15:59 -08:00
Brad Hefta-Gaub
74bafcbb10
Merge pull request #11795 from huffman/fix/ds-punchlist
...
Punchlist fixes for DS
2017-11-17 17:04:27 -08:00
Atlante45
1f23664c2f
Update wizard's congratulation page
2017-11-17 16:33:22 -08:00
Ryan Huffman
b5c4517ee7
Update DS Settings strings
2017-11-13 15:59:57 -08:00
Atlante45
8f133fc7fa
Congratulation page styling fixes
2017-11-10 18:12:43 -08:00
Atlante45
067436a743
CR
2017-11-10 18:12:33 -08:00
Atlante45
9cd8f372f2
Fix race condition
2017-11-10 16:21:06 -08:00
Atlante45
796909d366
Permissions page tweaks
2017-11-10 16:19:49 -08:00
Atlante45
2782ae03c5
Add back buttons
2017-11-10 15:48:44 -08:00
Atlante45
c047a1d0a4
Rework perms wizard page
2017-11-10 15:48:44 -08:00
Ryan Huffman
ecc76ab321
Remove dead code from ds settings
2017-11-10 15:35:05 -08:00
Ryan Huffman
2307cde599
Fix add-place button being added when account disconnected
2017-11-10 15:34:53 -08:00
Ryan Huffman
03364c1893
Cleanup DS settings for small screens
2017-11-10 15:34:22 -08:00
Ryan Huffman
d62c98c6e2
Update network address/port label in DS settings
2017-11-09 10:03:41 -08:00
Ryan Huffman
e274df065d
Fix label nav always being shown in ds settings nav
2017-11-09 09:25:16 -08:00
Ryan Huffman
3b702a7ae3
Make ESC close dialog windows on DS settings
2017-11-09 09:05:07 -08:00
Ryan Huffman
028410a26a
Fix alignment of Disconnect btn on ds settings
2017-11-08 14:05:51 -08:00
Ryan Huffman
1db8e2a0ec
Update create domain id language
2017-11-08 14:01:04 -08:00
Ryan Huffman
a55a30f87f
Fix 'Path' label when adding a place name
2017-11-08 14:00:43 -08:00
Ryan Huffman
c77942c542
Fix domain settings not showing label when first setting a placename
...
This occurs because previously we only created the input elements if you
have a domain id when the page loads. Because you can now have a domain
id assigned after the page initially loads, we need to always create the
input.
2017-11-08 13:36:03 -08:00
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
