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

Conflicts:
	webapp/components/create_comment.jsx

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

..

gitlab

Fix heavy regression on GitLab for version 3.0.0 (#3000)

2016-05-16 08:00:44 -04:00

access_test.go

Changing SpinPunch to Mattermost in copyright

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

access.go

PLT-7: Refactoring models to use translations (chunk 6)

2016-01-25 10:22:12 -03:00

analytics_row_test.go

Adding analytics tab

2015-10-22 18:04:06 -07:00

analytics_row.go

Adding analytics tab

2015-10-22 18:04:06 -07:00

audit_test.go

Changing SpinPunch to Mattermost in copyright

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

audit.go

Changing SpinPunch to Mattermost in copyright

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

audits_test.go

Changing SpinPunch to Mattermost in copyright

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

audits.go

Changing SpinPunch to Mattermost in copyright

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

authorize_test.go

Changing SpinPunch to Mattermost in copyright

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

authorize.go

PLT-7: Refactoring models to use translations (chunk 6)

2016-01-25 10:22:12 -03:00

channel_count.go

Changing SpinPunch to Mattermost in copyright

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

channel_data.go

Changing SpinPunch to Mattermost in copyright

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

channel_extra.go

Added ChannelExtra.MemberCount field to reflect the actual member count when we truncate the list of members to 20

2015-11-12 11:25:46 -05:00

channel_list.go

Changing SpinPunch to Mattermost in copyright

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

channel_member_test.go

Changing SpinPunch to Mattermost in copyright

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

channel_member.go

PLT-7: Refactoring models to use translations (chunk 6)

2016-01-25 10:22:12 -03:00

channel_test.go

Added Channel.Purpose on the server

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

channel.go

PLT-7: Refactoring models to use translations (chunk 6)

2016-01-25 10:22:12 -03:00

client.go

Close HTTP response bodies properly in golang driver (and some api functions) (#3217)

2016-06-02 12:40:34 -07:00

command_response_test.go

partial fix for UI

2016-01-08 12:41:26 -06:00

command_response.go

adding different commands

2016-01-09 08:54:07 -06:00

command_test.go

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

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

command.go

Added validation for command triggers (#3068)

2016-05-20 14:47:10 -04:00

compliance_post_test.go

PLT-2115 adding compliance feature to enterprise

2016-03-10 09:39:05 -08:00

compliance_post.go

PLT-2115 Adding compliance

2016-03-15 18:27:45 -07:00

compliance_test.go

PLT-2115 Adding compliance

2016-03-15 18:27:45 -07:00

compliance.go

PLT-2115 Adding compliance

2016-03-15 18:27:45 -07:00

config.go

Merge branch 'release-3.1'

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

file_info_test.go

Converting to Webpack. Stage 1.

2016-03-16 18:02:55 -04:00

file_info.go

Fixed serverside errors occurring when getting files with no extension

2016-01-25 09:51:17 -05:00

file.go

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

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

gitlab.go

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

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

incoming_webhook_test.go

Integrations: Enable <!channel> notifications in incoming webhooks (#3039)

2016-05-18 16:36:01 -04:00

incoming_webhook.go

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

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

initial_load_test.go

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

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

initial_load.go

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

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

job_test.go

Adding LDAP Syncronization (#3219)

2016-06-03 09:33:59 -04:00

job.go

Adding LDAP Syncronization (#3219)

2016-06-03 09:33:59 -04:00

ldap.go

Add the ability to switch from email to ldap and back

2016-03-23 15:59:58 -04:00

license_test.go

Add some unit tests

2016-01-14 08:24:09 -05:00

license.go

Port HPNS from 2.2 to master (#2863)

2016-05-03 08:54:49 -07:00

message_test.go

Changing SpinPunch to Mattermost in copyright

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

message.go

Add separator between DMs on your team and not (#2910)

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

oauth_test.go

Changing SpinPunch to Mattermost in copyright

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

oauth.go

PLT-7: Refactoring models to use translations (chunk 6)

2016-01-25 10:22:12 -03:00

outgoing_webhook_test.go

PLT-2170 Send payload in application/json for outgoing webhooks (#3160)

2016-05-31 10:51:28 -04:00

outgoing_webhook.go

PLT-2170 Send payload in application/json for outgoing webhooks (#3160)

2016-05-31 10:51:28 -04:00

password_recovery.go

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

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

post_list_test.go

Changed post searching to allow searching by multiple users/channels

2015-10-23 17:28:02 -04:00

post_list.go

Changed post searching to allow searching by multiple users/channels

2015-10-23 17:28:02 -04:00

post_test.go

PLT-1326: Enable channel posts of type join or leave not trigger unread notifications

2015-12-04 02:07:47 +01:00

post.go

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

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

preference_test.go

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

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

preference.go

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

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

preferences.go

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

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

push_notification_test.go

PLT-902 switching to push proxy server

2015-11-30 22:38:38 -08:00

push_notification.go

Port HPNS from 2.2 to master (#2863)

2016-05-03 08:54:49 -07:00

search_params_test.go

Stopped removing *s from the end of search phrases

2016-03-04 10:05:11 -05:00

search_params.go

PLT-2283 Improved trimming of punctuation from hashtags and search terms (#3178)

2016-06-01 13:05:36 -07:00

security_bulletin.go

Changing SpinPunch to Mattermost in copyright

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

session_test.go

Changing SpinPunch to Mattermost in copyright

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

session.go

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

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

suggest_command_test.go

Changing SpinPunch to Mattermost in copyright

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

suggest_command.go

Changing SpinPunch to Mattermost in copyright

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

system_test.go

Changing SpinPunch to Mattermost in copyright

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

system.go

PLT-2115 adding compliance interfaces

2016-03-11 16:53:32 -08:00

team_member_test.go

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

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

team_member.go

PLT-2697 Fixing team admins (#2900)

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

team_signup_test.go

Changing SpinPunch to Mattermost in copyright

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

team_signup.go

Changing SpinPunch to Mattermost in copyright

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

team_test.go

Updated emails in unit tests to include '+'

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

team.go

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

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

user_test.go

Added validation to make sure theme entries are colours (#3107)

2016-05-31 08:15:33 -04:00

user.go

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

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

utils_test.go

PLT-2283 Improved trimming of punctuation from hashtags and search terms (#3178)

2016-06-01 13:05:36 -07:00

utils.go

PLT-2283 Improved trimming of punctuation from hashtags and search terms (#3178)

2016-06-01 13:05:36 -07:00

version_test.go

Fixing version unit test

2016-02-09 16:22:52 -05:00

version.go

Bumping version to: 3.1.0-rc1

2016-06-06 21:57:07 +00:00