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
