Seth Alves
|
02ce2468df
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-07-12 13:46:29 -07:00 |
|
Clément Brisset
|
2f07f0d24f
|
Revert "Revert "Fix crash in packet list""
|
2016-07-12 11:39:16 -07:00 |
|
Clément Brisset
|
d933238bda
|
Revert "Fix crash in packet list"
|
2016-07-08 18:15:14 -07:00 |
|
Atlante45
|
97da515585
|
Assign random UUID to DS without one.
|
2016-07-08 15:15:58 -07:00 |
|
Seth Alves
|
55d76abf48
|
back-out accidently changed api urls
|
2016-07-06 16:42:31 -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 |
|
Stephen Birarda
|
1b87e902de
|
fix initialization of DEFAULT_HOURS in DomainMetadata
|
2016-06-29 13:23:52 -07:00 |
|
Zach Pomerantz
|
80fceccb7e
|
simplify hours parsing in domain metadata
|
2016-06-29 12:43:39 -07:00 |
|
Zach Pomerantz
|
c406538301
|
properly parse domain metadata hours
|
2016-06-28 12:40:25 -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
|
c7d56493b1
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-06-27 10:07:38 -07:00 |
|
Brad Hefta-Gaub
|
2e8f6c2cc6
|
Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
|
2016-06-24 14:08:29 -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 |
|
Brad Hefta-Gaub
|
cea4b27b4d
|
Merge pull request #8128 from zzmp/feat/heartbeat-build-version
add build version to heartbeat
|
2016-06-24 12:20:16 -07:00 |
|
Seth Alves
|
cc1b6f0cb2
|
add a permissions-grid row for friends-of-domain-owner
|
2016-06-24 11:42:56 -07:00 |
|
Zach Pomerantz
|
1fcd7aa0c4
|
add build version to heartbeat
|
2016-06-23 19:55:16 -07:00 |
|
Zach Pomerantz
|
b1b378a91f
|
add back access token to domain-server
|
2016-06-23 19:38:41 -07:00 |
|
Zach Pomerantz
|
13310923c4
|
reset to temp domain after logout
|
2016-06-23 19:38:23 -07:00 |
|
Zach Pomerantz
|
1de1c632af
|
use private_description instead of description for domain settings
|
2016-06-23 17:16:42 -07:00 |
|
Seth Alves
|
c4b0f1899e
|
merge from upstream
|
2016-06-23 13:26:01 -07:00 |
|
Zach Pomerantz
|
4a30d549ad
|
force temp domain reset on 404 too (401 already)
|
2016-06-22 12:04:26 -07:00 |
|
Zach Pomerantz
|
a6115cba6e
|
update temporary domains to use api_key
|
2016-06-22 12:04:26 -07:00 |
|
Zach Pomerantz
|
b6b73af2b4
|
Clean up domain-server setup
|
2016-06-22 12:02:35 -07:00 |
|
Seth Alves
|
fbfb6f169b
|
Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject
|
2016-06-22 10:02:12 -07:00 |
|
Zach Pomerantz
|
e03974181a
|
reformat operating hours to [[open,close]]
|
2016-06-21 17:19:37 -07:00 |
|
Seth Alves
|
9ca27f267d
|
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
|
2016-06-21 16:48:04 -07:00 |
|
Seth Alves
|
c97618f8bc
|
reduce the number of user public-key downloads during a login attempt
|
2016-06-21 11:40:55 -07:00 |
|
Zach Pomerantz
|
52170eb12e
|
use refs for domain metadata parsing
|
2016-06-21 11:21:20 -07:00 |
|
Seth Alves
|
f397c4760f
|
comments
|
2016-06-21 09:56:39 -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 |
|
Zach Pomerantz
|
4e0aeea2b8
|
add time offset to domain-server UI
|
2016-06-20 16:19:19 -07:00 |
|
Zach Pomerantz
|
cfe9ac32d4
|
fix narrowing warning by casting -1
|
2016-06-20 14:46:20 -07:00 |
|
Seth Alves
|
69f2f2e765
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-06-20 14:07:22 -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
|
fdafbd2015
|
apply a group's permissions to users who belong to the group
|
2016-06-20 14:02:23 -07:00 |
|
Seth Alves
|
82dd36459d
|
apply a group's permissions to users who belong to the group
|
2016-06-20 14:02:04 -07:00 |
|
Seth Alves
|
af52f6da82
|
remove some duplicate the's
|
2016-06-20 13:59:56 -07:00 |
|
Zach Pomerantz
|
25b21dacda
|
clean domain metadata and update acl
|
2016-06-20 13:44:14 -07:00 |
|
Zach Pomerantz
|
40f2d36487
|
fix hosts/tags in domain-server settings
|
2016-06-20 11:38:38 -07:00 |
|
Zach Pomerantz
|
1c188a270d
|
Merge pull request #8087 from zzmp/feat/send-domain-descriptors
send domain metadata to metaverse for authed domains
|
2016-06-20 11:22:01 -07:00 |
|
Seth Alves
|
764da926a3
|
merge sethalves:make-permissions-names-case-insensitive
|
2016-06-17 19:22:22 -07:00 |
|
Seth Alves
|
e606ffb002
|
use constant rather than hard-coding metaverse url
|
2016-06-17 18:12:03 -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
|
3fc9bdb3d0
|
undo accidental change
|
2016-06-16 16:44:18 -07:00 |
|