mirror of
https://github.com/discourse/discourse.git
synced 2025-02-22 12:17:12 +00:00
Revert "FEATURE: display github profile links on user card and profile"
This reverts commit 95c518329a077997cd859a36fe3558dae325890b.
This commit is contained in:
parent
e8a750e27a
commit
cc9b040502
@ -437,15 +437,7 @@ Discourse.User = Discourse.Model.extend({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, function () {});
|
}, function () {});
|
||||||
},
|
}
|
||||||
|
|
||||||
githubProfileUrl: function(){
|
|
||||||
|
|
||||||
var screenName = this.get('github_screen_name');
|
|
||||||
if(screenName) {
|
|
||||||
return "https://github.com/" + screenName;
|
|
||||||
}
|
|
||||||
}.property()
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -57,9 +57,6 @@
|
|||||||
<div class="metadata">
|
<div class="metadata">
|
||||||
<h3><span class='desc'>{{i18n last_post}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}} </h3>
|
<h3><span class='desc'>{{i18n last_post}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}} </h3>
|
||||||
<h3><span class='desc'>{{i18n joined}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
|
<h3><span class='desc'>{{i18n joined}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
|
||||||
{{#if user.githubProfileUrl}}
|
|
||||||
<h3><a href="{{unbound user.githubProfileUrl}}">{{i18n user.github_profile}}</a></h3>
|
|
||||||
{{/if}}
|
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
@ -150,10 +150,6 @@
|
|||||||
{{/if}}
|
{{/if}}
|
||||||
</dd>
|
</dd>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{#if github_screen_name}}
|
|
||||||
<dt>GitHub</dt>
|
|
||||||
<dd><a href="{{unbound githubProfileUrl}}">{{github_screen_name}}</a></dd>
|
|
||||||
{{/if}}
|
|
||||||
</dl>
|
</dl>
|
||||||
{{plugin-outlet "user-profile-secondary"}}
|
{{plugin-outlet "user-profile-secondary"}}
|
||||||
</div>
|
</div>
|
||||||
|
@ -215,9 +215,6 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
color: $primary;
|
color: $primary;
|
||||||
a {
|
|
||||||
color: $primary;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dt {
|
dt {
|
||||||
|
@ -257,9 +257,6 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
color: $primary;
|
color: $primary;
|
||||||
a {
|
|
||||||
color: $primary;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dt {
|
dt {
|
||||||
|
@ -48,8 +48,7 @@ class UserSerializer < BasicUserSerializer
|
|||||||
:has_title_badges,
|
:has_title_badges,
|
||||||
:edit_history_public,
|
:edit_history_public,
|
||||||
:custom_fields,
|
:custom_fields,
|
||||||
:user_fields,
|
:user_fields
|
||||||
:github_screen_name
|
|
||||||
|
|
||||||
has_one :invited_by, embed: :object, serializer: BasicUserSerializer
|
has_one :invited_by, embed: :object, serializer: BasicUserSerializer
|
||||||
has_many :custom_groups, embed: :object, serializer: BasicGroupSerializer
|
has_many :custom_groups, embed: :object, serializer: BasicGroupSerializer
|
||||||
@ -89,11 +88,6 @@ class UserSerializer < BasicUserSerializer
|
|||||||
###
|
###
|
||||||
### ATTRIBUTES
|
### ATTRIBUTES
|
||||||
###
|
###
|
||||||
def github_screen_name
|
|
||||||
if SiteSetting.public_github_screen_name
|
|
||||||
object.github_user_info && object.github_user_info.screen_name
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def include_email?
|
def include_email?
|
||||||
object.id && object.id == scope.user.try(:id)
|
object.id && object.id == scope.user.try(:id)
|
||||||
|
@ -808,7 +808,6 @@ en:
|
|||||||
facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
|
facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
|
||||||
|
|
||||||
enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret"
|
enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret"
|
||||||
public_github_screen_name: "Display Github screen names publicly in the forum (on user page and profile)"
|
|
||||||
github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications"
|
github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications"
|
||||||
github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
|
github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
|
||||||
|
|
||||||
|
@ -212,7 +212,6 @@ login:
|
|||||||
enable_github_logins:
|
enable_github_logins:
|
||||||
client: true
|
client: true
|
||||||
default: false
|
default: false
|
||||||
public_github_screen_name: true
|
|
||||||
github_client_id:
|
github_client_id:
|
||||||
default: ''
|
default: ''
|
||||||
regex: "^[a-f0-9]*$"
|
regex: "^[a-f0-9]*$"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user