merge with master

This commit is contained in:
Torkel Ödegaard
2016-09-28 13:02:15 +02:00
164 changed files with 7241 additions and 1917 deletions
-11
View File
@@ -57,17 +57,6 @@ func (this PlaylistDashboard) TableName() string {
type Playlists []*Playlist
type PlaylistDashboards []*PlaylistDashboard
//
// DTOS
//
type PlaylistDashboardDto struct {
Id int64 `json:"id"`
Slug string `json:"slug"`
Title string `json:"title"`
Uri string `json:"uri"`
}
//
// COMMANDS
//
+4 -4
View File
@@ -1,10 +1,10 @@
package models
type SystemStats struct {
DashboardCount int
UserCount int
OrgCount int
PlaylistCount int
DashboardCount int64
UserCount int64
OrgCount int64
PlaylistCount int64
}
type DataSourceStats struct {
+7
View File
@@ -0,0 +1,7 @@
package models
import "time"
type HourCommand struct {
Time time.Time
}