Christopher Speller 67db3ca8ce Merge pull request #1745 from mattermost/plt-1118 ...

PLT-1118 Add ability to switch between SSO and email account

2016-01-04 15:55:51 -05:00

..

templates

Merge pull request #1745 from mattermost/plt-1118

2016-01-04 15:55:51 -05:00

admin_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

admin.go

Merge branch 'master' into PLT-25

2015-10-23 08:38:15 -07:00

api_test.go

Marking when user ran the unit tests

2015-10-15 11:16:26 -07:00

api.go

Inital support for multi-tab loging

2015-10-16 09:10:54 -07:00

auto_channels.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

auto_constants.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

auto_environment.go

Go fmt and rename file with 'enviroment' in filename

2015-10-30 12:55:48 -05:00

auto_posts.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

auto_teams.go

Fix spelling of environment

2015-10-30 12:42:26 -05:00

auto_users.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

channel_benchmark_test.go

Renamed Channel.Description to Channel.Header on the server

2015-10-27 12:46:30 -04:00

channel_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

channel.go

Return 100 channel users in extra info call

2015-12-07 15:22:50 -05:00

command_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

command.go

Added /loadtest url command to load arbitrary files as posts

2015-11-23 13:47:47 -05:00

context_test.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

context.go

Implementing Permalinks and jumping to post from search. Performance

2015-11-23 09:53:15 -05:00

export.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

file_benchmark_test.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

file_test.go

Fixed TestGetFile unit test

2015-12-18 19:02:48 -05:00

file.go

Merge pull request #1763 from benburkert/non-s3-region

2016-01-04 07:13:38 -05:00

import.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

oauth_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

oauth.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

post_benchmark_test.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

post_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

post.go

Merge pull request #1726 from mattermost/PLT-1447

2015-12-15 07:07:35 -05:00

preference_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

preference.go

Fixed issue with Team Settings modal saving items instead of cancelling; changed remaining copyrights

2015-12-10 14:33:21 -08:00

server_test.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

server.go

upgrading libs

2015-11-23 15:51:43 -08:00

sharding.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

slackimport.go

Added Channel.Purpose on the server

2015-10-27 12:46:31 -04:00

team_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

team.go

Some refactoring

2015-12-16 17:30:15 -05:00

user_test.go

Add ability to switch between SSO and email account

2015-12-17 12:44:46 -05:00

user.go

Add ability to switch between SSO and email account

2015-12-17 12:44:46 -05:00

web_conn.go

Small refactor of websocket code on client and server

2015-10-16 11:48:55 -04:00

web_hub.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

web_socket_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

web_socket.go

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

web_team_hub.go

Added preference_changed web socket event

2015-12-07 18:13:14 -05:00

webhook_test.go

Updated emails in unit tests to include '+'

2015-12-13 14:21:23 -08:00

webhook.go

Implement outgoing webhooks.

2015-10-19 09:00:30 -04:00