Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
This commit is contained in:
kasenvr 2020-08-05 02:31:10 -04:00 committed by GitHub
parent 658e14be25
commit 4d3ca2fdc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/resources/describe-settings.json
View file

@ -414,7 +414,7 @@
"name": "group_permissions", "name": "group_permissions",
"type": "table", "type": "table",
"caption": "Permissions for Users in Groups", "caption": "Permissions for Users in Groups",
"help": "For groups that are supplied through OAuth, you will need to denote them by putting an \"@\" symbol in front of each item. e.g. \"@silver\"", "help": "For groups that are provided from WordPress you need to denote them by putting an \"@\" symbol in front of each item, e.g., \"@silver\"".
"categorize_by_key": "permissions_id", "categorize_by_key": "permissions_id",
"can_add_new_categories": true, "can_add_new_categories": true,
"can_add_new_rows": false, "can_add_new_rows": false,
@ -543,7 +543,7 @@
"name": "group_forbiddens", "name": "group_forbiddens",
"type": "table", "type": "table",
"caption": "Permissions Denied to Users in Groups", "caption": "Permissions Denied to Users in Groups",
"help": "For groups that are supplied through OAuth, you will need to denote them by putting an \"@\" symbol in front of each item. e.g. \"@silver\"", "help": "For groups that are provided from WordPress you need to denote them by putting an \"@\" symbol in front of each item, e.g., \"@silver\"".
"categorize_by_key": "permissions_id", "categorize_by_key": "permissions_id",
"can_add_new_categories": true, "can_add_new_categories": true,
"can_add_new_rows": false, "can_add_new_rows": false,

4
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -189,7 +189,7 @@ Item {
anchors { anchors {
top: parent.top top: parent.top
left: parent.left left: parent.left
right: parent.right; right: parent.right
topMargin: 1.5 * hifi.dimensions.contentSpacing.y topMargin: 1.5 * hifi.dimensions.contentSpacing.y
// horizontalCenter: mainContainer.horizontalCenter // horizontalCenter: mainContainer.horizontalCenter
} }
@ -595,7 +595,7 @@ Item {
leftMargin: hifi.dimensions.contentSpacing.x leftMargin: hifi.dimensions.contentSpacing.x
} }
text: "<a href='http://metaverse.vircadia.com/users/register'>Sign Up</a>" text: "<a href='https://metaverse.vircadia.com/users/register'>Sign Up</a>"
linkColor: hifi.colors.blueAccent linkColor: hifi.colors.blueAccent
onLinkActivated: { onLinkActivated: {

2
interface/src/Menu.cpp
View file

@ -10,7 +10,7 @@
// //
// For happ(ier) development of QML, use these two things: // For happ(ier) development of QML, use these two things:
// This forces QML files to be pulled from the source as you edit it: HIFI_USE_SOURCE_TREE_RESOURCES=1 // This forces QML files to be pulled from the source as you edit it: set environment variable HIFI_USE_SOURCE_TREE_RESOURCES=1
// Use this to live reload: DependencyManager::get<OffscreenUi>()->clearCache(); // Use this to live reload: DependencyManager::get<OffscreenUi>()->clearCache();
#include "Menu.h" #include "Menu.h"