codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/discourse/discourse

Browse source
This commit is contained in:
Simon Cossar 2015-06-15 15:13:08 -07:00
commit 15cb1bd094
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/dashboard.hbs
View file

@ -54,7 +54,7 @@
</thead>
<tbody>
{{#unless loading}}
{{admin-report-per-day-counts report=visits}}
{{admin-report-counts report=visits}}
{{admin-report-counts report=signups}}
{{admin-report-counts report=topics}}
{{admin-report-counts report=posts}}

2
app/assets/javascripts/discourse/models/topic.js.es6
View file

@ -9,7 +9,7 @@ const Topic = RestModel.extend({
let title = this.get("fancy_title");
if (Discourse.SiteSettings.enable_emoji && title.indexOf(":") >= 0) {
title = title.replace(/:\S+:?/, function(m) {
title = title.replace(/:\S+:?/g, function(m) {
const emoji = Discourse.Emoji.translations[m] ? Discourse.Emoji.translations[m] : m.slice(1, m.length - 1),
url = Discourse.Emoji.urlFor(emoji);
return url ? "<img src='" + url + "' title='" + emoji + "' alt='" + emoji + "' class='emoji'>" : m;

2
app/models/about.rb
View file

@ -27,11 +27,13 @@ class About
def moderators
@moderators ||= User.where(moderator: true, admin: false)
.where.not(id: Discourse::SYSTEM_USER_ID)
.order(:username_lower)
end
def admins
@admins ||= User.where(admin: true)
.where.not(id: Discourse::SYSTEM_USER_ID)
.order(:username_lower)
end
def stats

1
app/models/report.rb
View file

@ -76,6 +76,7 @@ class Report
def self.report_visits(report)
basic_report_about report, UserVisit, :by_day, report.start_date, report.end_date
add_counts report, UserVisit, 'visited_at'
end
def self.report_signups(report)