JoramWilander 5af526c259 Merge branch 'release-3.1' ...

Conflicts:
	webapp/components/create_comment.jsx

2016-06-13 15:29:24 -04:00

..

admin_test.go

PLT-2976 Adding checkout for missing SMTP server when testing email connection (#3115)

2016-05-26 07:55:37 -04:00

admin.go

PLT-2976 Adding checkout for missing SMTP server when testing email connection (#3115)

2016-05-26 07:55:37 -04:00

api.go

PLT-2559 Always return successful when trying to join a channel that the user is already a member of (#3265)

2016-06-06 13:03:56 -04:00

apitestlib.go

PLT-1800 Load server side locale from the config.json (#3202)

2016-06-02 12:47:26 -07:00

authentication.go

LDAP users should not be subject to password guess limits or email verification (#3245)

2016-06-05 03:38:36 -03: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-2559 Always return successful when trying to join a channel that the user is already a member of (#3265)

2016-06-06 13:03:56 -04:00

channel.go

PLT-2559 Always return successful when trying to join a channel that the user is already a member of (#3265)

2016-06-06 13:03:56 -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_expand_collapse_test.go

PLT-3114 Moved preview collapse out of pre-release features (#3206)

2016-06-06 10:41:54 -07:00

command_expand_collapse.go

PLT-3114 Moved preview collapse out of pre-release features (#3206)

2016-06-06 10:41:54 -07:00

command_invite_people_test.go

PLT-3131 Add slash command for sending email invites (#3218)

2016-06-02 19:39:23 -03:00

command_invite_people.go

PLT-3131 Add slash command for sending email invites (#3218)

2016-06-02 19:39:23 -03:00

command_join_test.go

Fixed double join messages (#3059)

2016-05-20 09:14:18 -04:00

command_join.go

Fixed double join messages (#3059)

2016-05-20 09:14:18 -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

Made message command for all users (#3122)

2016-05-26 10:03:06 -04:00

command_shortcuts_test.go

Added /shortcuts (#3048)

2016-05-19 07:35:12 -04:00

command_shortcuts.go

Added /shortcuts (#3048)

2016-05-19 07:35:12 -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

Added duplicated trigger validation (#3124)

2016-05-27 08:35:55 -07:00

command.go

PLT-2939 Fix Default slash command icon is invalid (#3250)

2016-06-06 08:59:19 -04:00

context_test.go

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

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

context.go

CLI: invite user by email - missing siteURL in email (#3297)

2016-06-10 07:59:20 -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-2061 Include FULL PATH in logs when referring to a directory (#3170)

2016-05-31 10:35:08 -04:00

general_test.go

Adding APIs to reload config, recycle db connections and ping server (#3096)

2016-05-24 14:31:30 -07:00

general.go

Adding APIs to reload config, recycle db connections and ping server (#3096)

2016-05-24 14:31:30 -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

Max_File_Size setting in System Console > File Settings (#3070)

2016-05-24 09:07:42 -04:00

oauth_test.go

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

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

oauth.go

Auto join teams if coming from team sign-up page to login for GitLab (#3284)

2016-06-07 17:43:06 -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

Add a wait condition in outgoing webhook test to prevent race condition (#3177)

2016-05-31 12:56:15 -04:00

post.go

System messages trigger notifications when user is mentioned (#3235)

2016-06-06 14:29:10 -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

Auto join teams if coming from team sign-up page to login for GitLab (#3284)

2016-06-07 17:43:06 -04:00

user_test.go

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

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

user.go

Auto join teams if coming from team sign-up page to login for GitLab (#3284)

2016-06-07 17:43:06 -04:00

web_conn.go

Move away from the "andForget" style of function (#3046)

2016-05-18 16:34:31 -04:00

web_hub.go

Move away from the "andForget" style of function (#3046)

2016-05-18 16:34:31 -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

Fixing websocket connection

2016-05-17 13:55:51 -07:00

webhook_test.go

Added duplicated trigger validation (#3124)

2016-05-27 08:35:55 -07:00

webhook.go

PLT-2058 Debugging incoming web hook content (#3150)

2016-06-10 09:59:24 -04:00