diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-08 07:25:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 07:25:57 +0800 |
| commit | 40c0c0bd13380acff2defd8644b714a4641d44c4 (patch) | |
| tree | 82ee31e6e34e565645eec21a1954ea705f10df26 | |
| parent | 0bb4add8a17fc1b0984094cf48da711b68a26d55 (diff) | |
| download | chat-40c0c0bd13380acff2defd8644b714a4641d44c4.tar.gz chat-40c0c0bd13380acff2defd8644b714a4641d44c4.tar.bz2 chat-40c0c0bd13380acff2defd8644b714a4641d44c4.zip | |
Enable emoji picker by default in config.json (#6871)
| -rw-r--r-- | config/config.json | 2 | ||||
| -rw-r--r-- | model/config.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index 3401a5e4f..a07cf5c19 100644 --- a/config/config.json +++ b/config/config.json @@ -38,7 +38,7 @@ "WebsocketPort": 80, "WebserverMode": "gzip", "EnableCustomEmoji": false, - "EnableEmojiPicker": false, + "EnableEmojiPicker": true, "RestrictCustomEmojiCreation": "all", "RestrictPostDelete": "all", "AllowEditPost": "always", diff --git a/model/config.go b/model/config.go index b7526925f..38d27d8bb 100644 --- a/model/config.go +++ b/model/config.go @@ -1033,7 +1033,7 @@ func (o *Config) SetDefaults() { if o.ServiceSettings.EnableEmojiPicker == nil { o.ServiceSettings.EnableEmojiPicker = new(bool) - *o.ServiceSettings.EnableEmojiPicker = false + *o.ServiceSettings.EnableEmojiPicker = true } if o.ServiceSettings.RestrictCustomEmojiCreation == nil { |