summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
Diffstat (limited to 'model')
-rw-r--r--model/access.go2
-rw-r--r--model/access_test.go2
-rw-r--r--model/audit.go2
-rw-r--r--model/audit_test.go2
-rw-r--r--model/audits.go2
-rw-r--r--model/audits_test.go2
-rw-r--r--model/authorize.go2
-rw-r--r--model/authorize_test.go2
-rw-r--r--model/channel.go2
-rw-r--r--model/channel_count.go2
-rw-r--r--model/channel_data.go2
-rw-r--r--model/channel_extra.go2
-rw-r--r--model/channel_list.go2
-rw-r--r--model/channel_member.go2
-rw-r--r--model/channel_member_test.go2
-rw-r--r--model/channel_test.go2
-rw-r--r--model/client.go2
-rw-r--r--model/command.go2
-rw-r--r--model/command_test.go2
-rw-r--r--model/config.go8
-rw-r--r--model/file.go2
-rw-r--r--model/gitlab.go2
-rw-r--r--model/message.go2
-rw-r--r--model/message_test.go2
-rw-r--r--model/oauth.go2
-rw-r--r--model/oauth_test.go2
-rw-r--r--model/post.go2
-rw-r--r--model/post_list.go2
-rw-r--r--model/post_list_test.go2
-rw-r--r--model/post_test.go2
-rw-r--r--model/security_bulletin.go55
-rw-r--r--model/session.go2
-rw-r--r--model/session_test.go2
-rw-r--r--model/suggest_command.go2
-rw-r--r--model/suggest_command_test.go2
-rw-r--r--model/system.go2
-rw-r--r--model/system_test.go2
-rw-r--r--model/team.go2
-rw-r--r--model/team_signup.go2
-rw-r--r--model/team_signup_test.go2
-rw-r--r--model/team_test.go2
-rw-r--r--model/user.go2
-rw-r--r--model/user_test.go2
-rw-r--r--model/utils.go2
-rw-r--r--model/utils_test.go2
-rw-r--r--model/version.go2
-rw-r--r--model/version_test.go2
-rw-r--r--model/webhook.go2
-rw-r--r--model/webhook_test.go2
49 files changed, 106 insertions, 51 deletions
diff --git a/model/access.go b/model/access.go
index 44a0463ac..89a1271c1 100644
--- a/model/access.go
+++ b/model/access.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/access_test.go b/model/access_test.go
index e385c0586..a018a2919 100644
--- a/model/access_test.go
+++ b/model/access_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/audit.go b/model/audit.go
index 9f3640350..8fa1d5584 100644
--- a/model/audit.go
+++ b/model/audit.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/audit_test.go b/model/audit_test.go
index a309f5c65..f4a2b6bcc 100644
--- a/model/audit_test.go
+++ b/model/audit_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/audits.go b/model/audits.go
index 9c88deef9..36c80629f 100644
--- a/model/audits.go
+++ b/model/audits.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/audits_test.go b/model/audits_test.go
index 59b510f54..6c7104475 100644
--- a/model/audits_test.go
+++ b/model/audits_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/authorize.go b/model/authorize.go
index 6eaac97f1..4176a9b89 100644
--- a/model/authorize.go
+++ b/model/authorize.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/authorize_test.go b/model/authorize_test.go
index 14524ad84..3fedc37e4 100644
--- a/model/authorize_test.go
+++ b/model/authorize_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel.go b/model/channel.go
index a7f007960..076ddf0b5 100644
--- a/model/channel.go
+++ b/model/channel.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_count.go b/model/channel_count.go
index 19d6ac150..6cc1b2f2d 100644
--- a/model/channel_count.go
+++ b/model/channel_count.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_data.go b/model/channel_data.go
index 234bdec6e..731d50e70 100644
--- a/model/channel_data.go
+++ b/model/channel_data.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_extra.go b/model/channel_extra.go
index 3a918b524..c6f0ca192 100644
--- a/model/channel_extra.go
+++ b/model/channel_extra.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_list.go b/model/channel_list.go
index 09f14a986..49ba384a2 100644
--- a/model/channel_list.go
+++ b/model/channel_list.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_member.go b/model/channel_member.go
index 3ae612700..e822ba443 100644
--- a/model/channel_member.go
+++ b/model/channel_member.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_member_test.go b/model/channel_member_test.go
index edbb46e9b..cff48ae27 100644
--- a/model/channel_member_test.go
+++ b/model/channel_member_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/channel_test.go b/model/channel_test.go
index 21fe71889..e5dfa3734 100644
--- a/model/channel_test.go
+++ b/model/channel_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/client.go b/model/client.go
index a291cc4f2..11beb9a87 100644
--- a/model/client.go
+++ b/model/client.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/command.go b/model/command.go
index 83243cc98..2b26aad1c 100644
--- a/model/command.go
+++ b/model/command.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/command_test.go b/model/command_test.go
index e3b732c02..61302ea10 100644
--- a/model/command_test.go
+++ b/model/command_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/config.go b/model/config.go
index c67b36063..e4b99ad4a 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
@@ -110,9 +110,9 @@ type RateLimitSettings struct {
}
type PrivacySettings struct {
- ShowEmailAddress bool
- ShowFullName bool
- EnableDiagnostic bool
+ ShowEmailAddress bool
+ ShowFullName bool
+ EnableSecurityFixAlert bool
}
type TeamSettings struct {
diff --git a/model/file.go b/model/file.go
index 85545d718..b7806b3b4 100644
--- a/model/file.go
+++ b/model/file.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/gitlab.go b/model/gitlab.go
index d281b6ea0..9f86c7b72 100644
--- a/model/gitlab.go
+++ b/model/gitlab.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/message.go b/model/message.go
index 8598bea0e..122af4d9c 100644
--- a/model/message.go
+++ b/model/message.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/message_test.go b/model/message_test.go
index eb0c75193..182678d8e 100644
--- a/model/message_test.go
+++ b/model/message_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/oauth.go b/model/oauth.go
index 3b31e677d..0320e7ec7 100644
--- a/model/oauth.go
+++ b/model/oauth.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/oauth_test.go b/model/oauth_test.go
index 2530ead98..2ba36666c 100644
--- a/model/oauth_test.go
+++ b/model/oauth_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/post.go b/model/post.go
index 1fc5963c3..11f3ad0d5 100644
--- a/model/post.go
+++ b/model/post.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/post_list.go b/model/post_list.go
index 88e3a9193..862673ef3 100644
--- a/model/post_list.go
+++ b/model/post_list.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/post_list_test.go b/model/post_list_test.go
index 7ce36c399..8a34327ce 100644
--- a/model/post_list_test.go
+++ b/model/post_list_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/post_test.go b/model/post_test.go
index a6b880fa0..f498c83e6 100644
--- a/model/post_test.go
+++ b/model/post_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/security_bulletin.go b/model/security_bulletin.go
new file mode 100644
index 000000000..8d9be6d3b
--- /dev/null
+++ b/model/security_bulletin.go
@@ -0,0 +1,55 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+ "encoding/json"
+ "io"
+)
+
+type SecurityBulletin struct {
+ Id string `json:"id"`
+ AppliesToVersion string `json:"applies_to_version"`
+}
+
+type SecurityBulletins []SecurityBulletin
+
+func (me *SecurityBulletin) ToJson() string {
+ b, err := json.Marshal(me)
+ if err != nil {
+ return ""
+ } else {
+ return string(b)
+ }
+}
+
+func SecurityBulletinFromJson(data io.Reader) *SecurityBulletin {
+ decoder := json.NewDecoder(data)
+ var o SecurityBulletin
+ err := decoder.Decode(&o)
+ if err == nil {
+ return &o
+ } else {
+ return nil
+ }
+}
+
+func (me SecurityBulletins) ToJson() string {
+ if b, err := json.Marshal(me); err != nil {
+ return "[]"
+ } else {
+ return string(b)
+ }
+}
+
+func SecurityBulletinsFromJson(data io.Reader) SecurityBulletins {
+ decoder := json.NewDecoder(data)
+ var o SecurityBulletins
+ err := decoder.Decode(&o)
+ if err == nil {
+ return o
+ } else {
+ return nil
+ }
+}
diff --git a/model/session.go b/model/session.go
index bb4d987a7..e2c1d4c55 100644
--- a/model/session.go
+++ b/model/session.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/session_test.go b/model/session_test.go
index 4df2a0d76..4cffcb9c0 100644
--- a/model/session_test.go
+++ b/model/session_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/suggest_command.go b/model/suggest_command.go
index 0c07ac58e..7bc35369c 100644
--- a/model/suggest_command.go
+++ b/model/suggest_command.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/suggest_command_test.go b/model/suggest_command_test.go
index a92b676ad..6be700859 100644
--- a/model/suggest_command_test.go
+++ b/model/suggest_command_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/system.go b/model/system.go
index c79391cca..033f660b3 100644
--- a/model/system.go
+++ b/model/system.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/system_test.go b/model/system_test.go
index 14ba0db2e..3f60eb5f9 100644
--- a/model/system_test.go
+++ b/model/system_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/team.go b/model/team.go
index f80fa3b11..c0f6524cd 100644
--- a/model/team.go
+++ b/model/team.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/team_signup.go b/model/team_signup.go
index 143ba8db1..e36420449 100644
--- a/model/team_signup.go
+++ b/model/team_signup.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/team_signup_test.go b/model/team_signup_test.go
index eb2fbc69f..a830842aa 100644
--- a/model/team_signup_test.go
+++ b/model/team_signup_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/team_test.go b/model/team_test.go
index 0dec07559..fd2428f03 100644
--- a/model/team_test.go
+++ b/model/team_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/user.go b/model/user.go
index d8000a7e2..15016f8dc 100644
--- a/model/user.go
+++ b/model/user.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/user_test.go b/model/user_test.go
index d9c1a00b6..662ae35a6 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/utils.go b/model/utils.go
index 93b8c4512..269144afc 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/utils_test.go b/model/utils_test.go
index 0f26526b2..7f14bcdf0 100644
--- a/model/utils_test.go
+++ b/model/utils_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/version.go b/model/version.go
index efa1697db..d03f64ba2 100644
--- a/model/version.go
+++ b/model/version.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/version_test.go b/model/version_test.go
index 24dbedaa6..33e8dc93e 100644
--- a/model/version_test.go
+++ b/model/version_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/webhook.go b/model/webhook.go
index 9b4db3246..3bf034908 100644
--- a/model/webhook.go
+++ b/model/webhook.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model
diff --git a/model/webhook_test.go b/model/webhook_test.go
index ddbe18cd3..5297d7d90 100644
--- a/model/webhook_test.go
+++ b/model/webhook_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package model