diff options
| -rw-r--r-- | CHANGELOG.md | 19 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | api/command.go | 6 | ||||
| -rw-r--r-- | model/client.go | 1 |
4 files changed, 25 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aac49ff2..f8d808837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,18 @@ The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the produ ### New Features -- [See Product Roadmap for anticipated features](https://mattermost.atlassian.net/issues/?filter=10002) +Messaging, Comments and Notifications + +- (Preview) Added emoji support http://www.emoji-cheat-sheet.com/ + +Admin Console + +- (Preview) Ability to view server logs and change config settings + +Integrations + +- (Preview) Added API for incoming webhooks +- (Preview) Added OAuth2 as a service provider to allow for more secure connection to external apps ### Improvements @@ -42,7 +53,11 @@ Code Quality Many thanks to our external contributors. In no particular order: -- TBA +- [Trozz](https://github.com/Trozz) +- [LAndres](https://github.com/LAndreas) +- [JessBot](https://github.com/JessBot) +- [apaatsio](https://github.com/apaatsio) +- [chengweiv5](https://github.com/chengweiv5) ## Release v0.7.0 (Beta1) @@ -48,8 +48,10 @@ There are multiple ways to install Mattermost depending on your needs. #### Development Install -- [Developer Machine Setup](doc/install/dev-setup.md) - Setup your local machine development environment using Docker on Mac OSX or Ubuntu. - +- [Developer Machine Setup](doc/install/dev-setup.md) - Setup your local machine development environment using Docker on Mac OSX or Ubuntu. Pull the latest stable release or pull the latest code from our development build. + +[](https://travis-ci.org/mattermost/platform) + #### Production Deployment (for Beta2 and later) Prior to production installation, please review [Mattermost system requirements](doc/install/requirements.md). diff --git a/api/command.go b/api/command.go index be1d3229b..bc55f206b 100644 --- a/api/command.go +++ b/api/command.go @@ -341,7 +341,7 @@ func loadTestSetupCommand(c *Context, command *model.Command) bool { } } } else { - client.MockSession(c.Session.Id) + client.MockSession(c.Session.Token) CreateTestEnviromentInTeam( client, c.Session.TeamId, @@ -406,7 +406,7 @@ func loadTestChannelsCommand(c *Context, command *model.Command) bool { channelsr = utils.Range{20, 30} } client := model.NewClient(c.GetSiteURL()) - client.MockSession(c.Session.Id) + client.MockSession(c.Session.Token) channelCreator := NewAutoChannelCreator(client, c.Session.TeamId) channelCreator.Fuzzy = doFuzz channelCreator.CreateTestChannels(channelsr) @@ -458,7 +458,7 @@ func loadTestPostsCommand(c *Context, command *model.Command) bool { } client := model.NewClient(c.GetSiteURL()) - client.MockSession(c.Session.Id) + client.MockSession(c.Session.Token) testPoster := NewAutoPostCreator(client, command.ChannelId) testPoster.Fuzzy = doFuzz testPoster.Users = usernames diff --git a/model/client.go b/model/client.go index d720f30f8..f9127719f 100644 --- a/model/client.go +++ b/model/client.go @@ -808,4 +808,5 @@ func (c *Client) GetAccessToken(data url.Values) (*Result, *AppError) { func (c *Client) MockSession(sessionToken string) { c.AuthToken = sessionToken + c.AuthType = HEADER_BEARER } |