mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
10 203 коммитов 3 Ветки 0 Теги
687700a989810ec99bc6b52a1e3900a237a4cd54
Граф коммитов

10203 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Joram Wilander
191e1ad556 MM-8180 Improve error message for testing smtp connections (#8608) 
* Improve error message for testing smtp connections

* Update error message
 2018-04-12 11:36:56 -04:00
Elias Nahum
bc49b12427 translations PR 20180411 (#8606) 2018-04-12 10:11:55 -04:00
Elias Nahum
1ebf19825b Fix mute channel when not a member and adding unit tests (#8609) 2018-04-12 09:12:59 -04:00
Harrison Healey
2d0fef4d94 MM-10036 Ensured correct handling of capitalized special mentions (#8607) 2018-04-11 10:33:20 -04:00
Derrick Anderson
332411490d Merge branch 'jespino-merge-release-4.9' 2018-04-10 10:55:25 -04:00
Jesús Espino
5856325c13 Merge remote-tracking branch 'origin/release-4.9' into merge-release-4.9 2018-04-10 11:29:03 +02:00
Harrison Healey
0a6b96cb40 MM-9849 Added tracking of which settings are set through environment variables (#8586) 
* MM-9849 Added tracking of which settings are set through environment variables

* Removed old version of viper

* Added forked version of viper

* Fixed unit tests

* Fixed more unit tests

* Removed copy from App.GetEnvironmentConfig
 2018-04-09 18:16:11 +02:00
Martin Kraft
ffa24fbcb2 MM-8834: Changes separator between jobs message and details. (#8589) 2018-04-09 09:39:57 -04:00
Harrison Healey
57ee6f505e Added additional unit tests for IE11 and compatibility mode (#8573) 2018-04-09 11:14:36 +01:00
Jesse Hallam
116849842b MM-8678: add CUD support for channel members via plugins (#8565) 
* add CUD support for channel members via plugins

This effectively exposes AddChannelMember, UpdateChannelMemberRoles,
UpdateChannelMemberNotifyProps and LeaveChannel via the plugin API.

It also modifies the semantics of AddChannelMember to explicitly allow
for an empty user requestor, left as such for now via the plugin API.

* change the signature of AddChannelMember to accept a channel id instead of a channel
 2018-04-06 17:08:57 -04:00
Jesús Espino
be972fde28 Adding minio-go for to the dependencies to temporary fix 2 minio-go bugs (#8577) 2018-04-06 15:59:09 -04:00
Harrison Healey
ff077c6761 MM-8400 Provide default config values to viper so that it reads all environment variables (#8581) 
* MM-8400 Provide default config values to viper so that it reads all environment variables

* Added unit tests
 2018-04-06 12:17:43 -04:00
Saturnino Abril
e16217166d fix out of channel mentions for mentioned word with valid punctuations (#8585) 2018-04-06 09:41:45 -04:00
Derrick Anderson
f9015a37f3 uncomment 4.9 upgrade code (#8582) 
* set db to 4.9

* add prepatory code for 4.10

* bug from old example
 2018-04-05 11:45:55 -04:00
Derrick Anderson
f7dd715052 update db code for release branch only (#8584) 2018-04-05 11:27:19 -04:00
Joram Wilander
715a7f893d Remove problematic mute test (#8580) 2018-04-05 08:53:01 -04:00
Joram Wilander
fb45087545 Comment out problematic mail test (#8579) 2018-04-04 22:24:26 -04:00
Jason Blais
e377baca00 Minor text changes to /open, /join and /mute slash commands (#8569) 
* Update en.json

* Update en.json

* Update en.json

* Fix bad rebasing

* ping jenkins
 2018-04-04 19:45:40 -04:00
Jesús Espino
846ccac6e5 MM-9934: More robust slack imports parsing (#8576) 2018-04-04 08:21:31 -07:00
Jesús Espino
654042a245 Migrate Advanced Permissions Roles when needed on cli commands (#8535) 2018-04-04 09:15:52 -04:00
Jason Blais
7986eeea26 Add missing timezone setting to app/diagnostics.go (#8572) 
* Add missing timezone setting to app/diagnostics.go

* Update diagnostics.go

* Added TimezoneSettings.SupportedTimezonesPath to diagnostics
 2018-04-04 08:14:23 -04:00
Christopher Speller
80925f7cfd Fixing unit tests for Go 1.10 (#8568) 2018-04-03 15:41:02 -04:00
Saturnino Abril
1476ca5b2d revert default ephemeral post message for out of channel mention (#8571) 2018-04-04 02:22:06 +08:00
Elias Nahum
0ab47cf145 translations PR 20180402 (#8570) 2018-04-03 05:27:59 +03:00
Harrison Healey
088f76ad6e MM-9868 Fixed mentioning users when followed by multiple periods (#8548) 
* MM-9868 Fixed mentioning users when followed by multiple periods

* Added additional unit test

* Added comment to clarify test purpose
 2018-04-02 12:40:28 -04:00
Elias Nahum
cffb891854 Make channel mute command respond with and without ~ prefix (#8549) 
* Make channel mute command respond with and without ~ prefix

* Re-use splitMessage
 2018-04-02 08:58:39 -07:00
Christopher Speller
cf1688f94a Fixing DB load causing user logout. (#8559) 2018-04-02 08:22:25 -07:00
Chris Duarte
80b3d14b56 Initialize timezone to a default state (#8560) 2018-03-29 23:50:24 -04:00
Christopher Speller
59606791a7 MM-9999 Fix unwanted team invite_id in email invites. (#8550) 
* Fix unwanted team invite_id in email invites.

* Removing unused translation.
 2018-03-29 14:20:36 -07:00
Christopher Speller
6fcdf4abc6 Fix sanitization on websocket user edit events. (#8551) 2018-03-29 17:03:27 -04:00
Joram Wilander
42c9170444 Update zoom plugin (#8542) 2018-03-29 14:58:33 -04:00
Jesse Hallam
0affad9c24 fix user timezone initialization (#8547) 
On PreSave, need to ensure TimeZone isn't left as NULL.
 2018-03-29 14:58:18 -04:00
Jesús Espino
014a3b6a60 Fixing misspell errors (#8544) 2018-03-29 10:04:54 -04:00
Chris Duarte
eb48292a3a Add ExperimentalTimezone flag (#8539) 2018-03-29 10:04:17 -04:00
Jesse Hallam
d4c0494360 MM-9661: tweak post message size log (#8517) 
Call out the number of supported characters explicitly, moving the byte
limit to parentheses.
 2018-03-29 10:02:58 -04:00
Christopher Speller
26b523e4a1 Revert "add individual platform packaging targets (#8366)" (#8537) 
This reverts commit f0f4f68def.
 2018-03-28 14:54:58 -07:00
Jesse Hallam
9c9a9ade12 Remove the index on Channels.DisplayName. (#8530) 
As outlined in [this
discussion](https://pre-release.mattermost.com/core/pl/uw5bwmkb6irkbkn6pk9rkzpytr),
this index causes issues with MySQL's query planner, leading to full
table scans in a case where it would have made more sense to leverage a
filesort.
 2018-03-28 09:22:55 -07:00
Jesse Hallam
1ccad749f1 Add unit test coverage for SqlStatusStore.GetAllFromTeam (#8520) 
I added this as part of a separate PR that was deferred for now, but
figured the unit test coverage would still be useful.
 2018-03-28 09:20:39 -07:00
Joram Wilander
3394a51dc6 Add defaults for SAML settings (#8536) 2018-03-28 11:24:13 -04:00
Jason Blais
5151a92f91 Add SAML scoping IDP settings to diagnostics.go (#8531) 2018-03-28 12:54:44 +01:00
George Goldberg
a28f6e7748 Fix roles table ID max length so MySQL 5.6 doesn't fail. (#8532) 2018-03-28 09:58:00 +01:00
Elias Nahum
ad8bf48c4e translations PR 20180326 (#8514) 2018-03-28 10:08:07 +03:00
Christian Claus
257f748732 [PLT-4340] Channel Mute and "/mute" command #7617 (#7713) 
* Add command and store changes to allow mute toggling

* Change channel muting to use ChannelMember notification structure

* Suppress email and push notifications for a muted channel

* Make i18n keys issue-compliant

* Add notification-cache handling for channel-muting

* Add channel handle for channel-muting slash-command

* Add unit test for mute command

* Merge branch 'master' into PLT-4340

# Conflicts:
#	app/notification.go

* Fix issue that command_mute responses will be overwritten

* Fix i18n key for channel muting

* Apply new Provider Interface to MuteCommand

* Migrate mute notification property to mark_unread

PLT-4340

* Make some i18n improvements for command_mute

PLT-4340

* Remove de.json translations

* Prevent push notifications when channel is muted

* Treat Group messages like Direct messages

* Fix unit test

* Send WS event when the channel member notify props changed
 2018-03-28 07:02:04 +03:00
George Goldberg
71c9dff766 Merge branch 'advanced-permissions-phase-1' 2018-03-27 22:36:55 +01:00
Jesse Hallam
2af4c7e649 fix typo in the pull request template (#8521) 2018-03-27 15:18:57 -04:00
amyblais
e40b7f6b31 Update NOTICE.txt (#8523) 2018-03-27 15:18:28 -04:00
Saturnino Abril
07b14c370a post a system message after a channel is converted from public to private (#8501) 2018-03-27 21:14:42 +08:00
Martin Kraft
e13e64711f Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 2018-03-27 09:01:42 -04:00
George Goldberg
d8b4207018 Fix typo in MANAGE_SYSTEM_WIDE_OAUTH permission. (#8516) 2018-03-27 13:42:44 +01:00
Jesús Espino
9e6db178b0 Adding durafmt library and use it from enterprise global relay export (#8487) 
* Adding durafmt library and use it from enterprise global relay export

* Allow to specify different server host and server name on smtp connections

* Fixing utils/smtp tests
 2018-03-27 10:23:33 +02:00