Christopher Speller d1efb66ad7 Merge branch 'release-3.0'

2016-05-12 12:11:02 -04:00

..

admin_test.go

PLT-2905 fixing upgrade of SSO accounts (#2962)

2016-05-11 14:04:30 -04:00

admin.go

Fixing compliance reporting (#2964)

2016-05-11 09:24:20 -03:00

api.go

PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public file links (#2892)

2016-05-05 16:35:03 -04:00

apitestlib.go

PLT-2697 Fixing team admins (#2900)

2016-05-06 14:28:22 -04:00

authentication.go

PLT-2905 fixing upgrade of SSO accounts (#2962)

2016-05-11 14:04:30 -04:00

auto_channels.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

auto_constants.go

Changing SpinPunch to Mattermost in copyright

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

auto_environment.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

auto_posts.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

auto_teams.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

auto_users.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

channel_benchmark_test.go

PLT-2258 Unified login screen and related APIs (#2820)

2016-05-03 14:10:36 -04:00

channel_test.go

PLT-2674 Private Group should not have Leave option when only one member remains (#2888)

2016-05-10 08:24:52 -04:00

channel.go

PLT-2674 Private Group should not have Leave option when only one member remains (#2888)

2016-05-10 08:24:52 -04:00

cli_test.go

PLT-2707 Adding option to show DM list from all of server (#2871)

2016-05-04 09:31:42 -04:00

command_echo_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

command_echo.go

Adding loc to new command backend

2016-02-01 18:52:43 -08:00

command_join_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

command_join.go

Fixing permalinks to channels your not a memeber of (#2805)

2016-04-27 16:02:58 -04:00

command_loadtest_test.go

PLT-2298 fixing ephemeral message for loadtests (#2788)

2016-04-25 08:39:02 -04:00

command_loadtest.go

PLT-2258 Unified login screen and related APIs (#2820)

2016-05-03 14:10:36 -04:00

command_logout_test.go

Fixing /logout command (#2908)

2016-05-06 12:08:49 -04:00

command_logout.go

Fixing /logout command (#2908)

2016-05-06 12:08:49 -04:00

command_me_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

command_me.go

Adding loc to new command backend

2016-02-01 18:52:43 -08:00

command_msg_test.go

Recent mention searches now OR terms instead of AND (#2931)

2016-05-09 09:00:08 -07:00

command_msg.go

Fixing edit direct channel header (#2842)

2016-05-02 12:57:32 -04:00

command_shrug_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

command_shrug.go

Adding loc to new command backend

2016-02-01 18:52:43 -08:00

command_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

command.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

context_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

context.go

PLT-2697 Fixing team admins (#2900)

2016-05-06 14:28:22 -04:00

export.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

file_benchmark_test.go

PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public file links (#2892)

2016-05-05 16:35:03 -04:00

file_test.go

PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public file links (#2892)

2016-05-05 16:35:03 -04:00

file.go

PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON string (#2914)

2016-05-06 11:32:08 -07:00

import.go

Fixing slack import. (#2819)

2016-04-28 16:29:13 -04:00

license_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

license.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

oauth_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

oauth.go

PLT-2905 fixing upgrade of SSO accounts (#2962)

2016-05-11 14:04:30 -04:00

post_benchmark_test.go

Recent mention searches now OR terms instead of AND (#2931)

2016-05-09 09:00:08 -07:00

post_test.go

Recent mention searches now OR terms instead of AND (#2931)

2016-05-09 09:00:08 -07:00

post.go

Fix parsing attachment field links into markdown (#2958) (#2959)

2016-05-12 12:04:12 -04:00

preference_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

preference.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

server_test.go

Changing SpinPunch to Mattermost in copyright

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

server.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

slackimport.go

Fixing slack import. (#2819)

2016-04-28 16:29:13 -04:00

team_test.go

PLT-2697 Fixing team admins (#2900)

2016-05-06 14:28:22 -04:00

team.go

Removing export route (#2955)

2016-05-11 08:04:01 -04:00

user_test.go

PLT-2905 fixing upgrade of SSO accounts (#2962)

2016-05-11 14:04:30 -04:00

user.go

Improved handling of edge case where an LDAP user shares a username with a non-LDAP user (#2980)

2016-05-12 12:06:26 -04:00

web_conn.go

Add websocket event and cache invalidation for deleting channels (#2807)

2016-04-27 16:05:39 -04:00

web_hub.go

Add websocket event and cache invalidation for deleting channels (#2807)

2016-04-27 16:05:39 -04:00

web_socket_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

web_socket.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

webhook_test.go

PLT-2057 User as a first class object (#2648)

2016-04-21 22:37:01 -07:00

webhook.go

Improve incoming webhook slack compatibility (#2972) (#2973)

2016-05-12 12:04:59 -04:00