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
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
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
Atlante45
56e9a9aaf9
Handle old configs
2017-10-27 17:32:11 -07:00
Atlante45
203a419f2a
Setup Wizard
2017-10-27 12:52:36 -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
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
e0fd391766
Add permission level for replacing domain content
2017-07-18 14:34:22 -07:00
utkarshgautamnyu
d5c88bc6de
Merge branch 'master' into bug/5950
2017-07-06 12:52:13 -07:00
utkarshgautamnyu
8c96d00f14
Update DomainServerSettingsManager.cpp
2017-07-05 16:59:47 -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
Stephen Birarda
94abfc2d6b
nomenclature changes from replication to broadcast
2017-06-15 11:47:13 -07:00
Ryan Huffman
ea56c568a7
Add support for replicating by username
2017-06-13 17:18:28 -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
David Kelly
a8831e89ff
Ban only by machine fingerprint, when possible
2017-02-16 09:50:56 -07: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
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
Stephen Birarda
4bbd823a5a
remove open hours from domain settings
2017-02-06 10:50:59 -08:00
Stephen Birarda
fb8d2e34fb
fix needless reinterpret_cast for DomainServerNodeData
2017-01-23 13:14:53 -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
Zach Fox
e22c1ac30e
Fix the bug
2017-01-16 11:48:51 -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
David Kelly
126ae52cb4
Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS
2016-12-16 12:17:54 -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
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
Chris Collins
6581a51bc9
Merge pull request #9052 from davidkelly/dk/2226
...
Add ability to mute user
2016-11-11 16:02:08 -08:00
Ryan Huffman
e177004d71
Fix ds not restarting when changing ac whitelist
2016-11-11 14:23: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
David Kelly
285520dff7
Initial cut
...
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08: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
Stephen Birarda
5bac88c004
default domain-server permissions to connect for standard
2016-08-11 10:52:36 -07:00
Seth Alves
3ca1ee1d82
Fix some group-related code to handle CamelCase usernames
2016-08-04 17:39:41 -07:00
Stephen Birarda
5eb890e4f5
add a simple IP address sanitizer for DS settings save
2016-08-02 14:35:51 -07:00
Stephen Birarda
39e6ac0974
cleanup API for HifiConfigVariantMap after migration
2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08
migrate the deprecated merged master/user config
2016-08-02 14:35:11 -07:00
Stephen Birarda
285478f1b2
don't repack the same permissions after kick
2016-08-02 14:35:11 -07:00
Stephen Birarda
5b04ab6d53
add node kick request handling to DS
2016-08-02 14:35:11 -07:00
Stephen Birarda
eaf52ae111
default kick perms for localhost
2016-08-02 14:35:11 -07:00
Stephen Birarda
5d69c9c81e
fix sockaddr choice for local nodes
2016-08-02 14:35:11 -07:00
Stephen Birarda
b1e0e6d708
use replacement for IP address perms, not additive
2016-08-02 14:35:11 -07:00
Stephen Birarda
f7298ef767
add packing of IP perms, small cleanup in packing
2016-08-02 14:35:11 -07:00
Stephen Birarda
cd436355fc
cleanup handling of defaults for standard user perms
2016-08-02 14:35:11 -07:00
Stephen Birarda
a674c843c2
add unpack for IP, DRYup unpackPermissions
2016-08-02 14:35:11 -07:00
Seth Alves
3a3b1489c6
code review
2016-07-27 11:46:52 -07:00
Seth Alves
bc2ded2f97
code review
2016-07-27 08:46:46 -07:00
Seth Alves
148793011d
code review
2016-07-27 07:55:09 -07:00
Seth Alves
f35b935031
do some cleaning-up of the domain-server settings page group tables
2016-07-22 17:51:31 -07:00
Seth Alves
6ec8aff645
remove group-related debug prints
2016-07-22 12:02:17 -07:00
Seth Alves
adba4cde0b
book-keeping around groups and ranks
2016-07-22 11:40:23 -07:00
Seth Alves
97b40ab87d
adapting to api changes
2016-07-21 14:04:55 -07:00
Seth Alves
599b892296
refresh cached group information every 15 seconds
2016-07-14 11:20:57 -07:00
Seth Alves
e6f456f494
each rank in a group has its own permissions
2016-07-06 16:39:08 -07:00
Seth Alves
2a25f458fc
fetch rank names from web api after getting a group's ID
2016-07-04 10:20:25 -07:00
Seth Alves
aae42e3802
updates to track zach's changes to api
2016-06-30 16:14:46 -07:00
Seth Alves
408a77dd13
merge from upstream
2016-06-29 18:49:33 -07:00
Zach Pomerantz
56038a97a6
add domain settings getter for descriptors, validates nested vals
2016-06-28 12:39:00 -07:00
Seth Alves
d4cc4bf1e4
represent node permissions as a bitfield rather than a list of bools
2016-06-27 14:55:13 -07:00
Seth Alves
ead6e476a9
add a list of blacklist groups which remove permissions rather than grant them
2016-06-24 14:03:43 -07:00
Seth Alves
cc1b6f0cb2
add a permissions-grid row for friends-of-domain-owner
2016-06-24 11:42:56 -07:00
Seth Alves
c4b0f1899e
merge from upstream
2016-06-23 13:26:01 -07:00
Zach Pomerantz
807596596f
fix badging, parsing of operating hours
2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d
add operating hours to domain-server settings/UI
2016-06-20 22:58:20 -07:00
Seth Alves
ba032ce0b4
apply a group's permissions to users who belong to the group
2016-06-20 14:06:09 -07:00
Seth Alves
764da926a3
merge sethalves:make-permissions-names-case-insensitive
2016-06-17 19:22:22 -07:00
Seth Alves
d8a67850f2
treat usernames in permissions-grid on domain-server settings page as case-insensitive
2016-06-17 15:17:51 -07:00
Seth Alves
de100e8141
after receiving a group's ID from api, save it
2016-06-17 13:29:42 -07:00
Seth Alves
dd24143d16
start on handling group permissions
2016-06-16 16:41:47 -07:00
Seth Alves
441b5a20d8
merge from upstream
2016-06-09 13:23:41 -07:00
Seth Alves
8085266c1d
cause names in permissions tables to be alpha-sorted
2016-06-08 10:36:44 -07:00
Seth Alves
b2f63a2132
hook up can-rez-tmp and can-write-to-asset-server
2016-06-07 16:17:58 -07:00
Seth Alves
0c18df6278
don't restart domain-server if the only settings changes where permissions
2016-06-06 16:32:18 -07:00
Seth Alves
d202a2bf11
better handling of missing settings keys
2016-06-06 11:59:39 -07:00
Seth Alves
a4e4093a18
split permissions into two sets, one for 'standard' ones and one for specific users
2016-06-06 10:39:47 -07:00
Seth Alves
adf893ea19
rename AgentPermissions to NodePermissions
2016-06-04 09:50:36 -07:00
Seth Alves
09b0e3eaaf
use constants rather than bare strings for standard psuedo-account-names
2016-06-04 09:07:34 -07:00
Seth Alves
b88bba8672
add code to convert older domain-settings to current style
2016-06-03 13:15:53 -07:00
Seth Alves
d010dc9699
keep localhost line from being added every save. added some debugging print stuff
2016-06-02 15:08:16 -07:00
