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

9694 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Derrick Anderson
ff5f511dfd Merge remote-tracking branch 'origin/t3mergetomaster' 2018-03-13 09:44:18 -04:00
Derrick Anderson
0d1177cdf9 Merge remote-tracking branch 'origin/release-4.8' into t3mergetomaster 2018-03-12 16:47:55 -04:00
Jesús Espino
2b460da1d5 Fix saml users.json parameter (#8435) 2018-03-12 14:16:22 -04:00
Jesús Espino
f2d26801b9 Adding new global relay settings to diagnostics and default.json (#8441) 2018-03-12 17:52:17 +00:00
Harrison Healey
4e26594fcb Removed mssola/user_agent library (#8417) 
* Removed mssola/user_agent library

* Changed user agent tests to use t.Run
 2018-03-12 10:21:20 -04:00
Carlos Tadeu Panato Junior
81acb1a14b [MM-9720] Platform command to change user email address (#8422) 2018-03-12 07:40:44 -04:00
Carlos Tadeu Panato Junior
cb1b8fc333 [MM-9725] Slack compatibility code in webhooks captures incorrect text (#8428) 2018-03-12 07:40:11 -04:00
Carlos Tadeu Panato Junior
46fea093c8 using inbucket docker image tag release-1.2.0 instead of latest (#8406) 2018-03-12 07:39:06 -04:00
Harrison Healey
22f2245a26 ICU-682 Stopped sending out of channel mention warnings for system messages (#8426) 2018-03-09 12:16:27 -05:00
Martin Kraft
426796829a MM-8839: Adds ChannelType to compliance-related model. (#8424) 2018-03-09 10:30:05 -05:00
Joram Wilander
8ad99b4b1f Remove query to update channel extra_update_at field on user activation/deactivation (#8415) 2018-03-09 08:06:31 -05:00
Stephen Kiers
302dae5bb9 MM-9274- Sort Users in Channel by status (#8181) 
* sort by lastActivity

* added status ordering to Users

* sort offline before dnd

* remove data not needed

* added seperate call for when order=‘status’ is on GetUser request

* remove PrintLn

* styling fix

* remove mistake

* mistake 2

* better comment

* explicit if statemnt

* writing tests

* removed manually added mocks

* generated mock

* ICU-668 Added unit tests

* style fix

* sort by lastActivity

* added status ordering to Users

* sort offline before dnd

* remove data not needed

* added seperate call for when order=‘status’ is on GetUser request

* remove PrintLn

* styling fix

* remove mistake

* mistake 2

* better comment

* explicit if statemnt

* writing tests

* removed manually added mocks

* generated mock

* ICU-668 Added unit tests

* style fix

* reverse dnd and offline

* Fixed app.SaveStatusAndBroadcast

* Fixed incorrect merge

* Fixing incorrect merge again
 2018-03-09 07:48:30 -05:00
Chris
3922b3ac8c fix sandbox cleanup (#8421) 2018-03-08 14:19:56 +00:00
Derrick Anderson
31532f7feb Merge branch 'merge-4.8' 2018-03-08 07:45:04 -05:00
JoramWilander
8010cef1d9 Merge branch 'release-4.8' into merge-4.8 2018-03-08 07:19:50 -05:00
Joram Wilander
4081bb2a71 Moved team icon upgrade code to 4.9 since it didn't make it in for 4.8 (#8410) 2018-03-08 07:18:49 -05:00
Jonathan
5ed3b42629 MM-8840: Add GlobalRelay Configuration Settings (#8304) 
* Added new GlobalRelay config settings

* Adding default values to global relay config

* Migrate global relay config tests to table driven tests
 2018-03-08 06:45:36 -05:00
Jesús Espino
b2dd00dd5b Adding enterprise commands support (#8327) 2018-03-07 20:04:18 +00:00
Chris
98e1231fcc respect plugin manifest webapp bundle_path (#8393) 2018-03-07 13:57:59 -06:00
Chris
03b6d1f652 respect plugin manifest webapp bundle_path (#8393) 2018-03-07 13:53:07 -06:00
Chris
e4ddad16bf plugin sandbox fixes (#8418) 2018-03-07 13:43:26 -05:00
Elias Nahum
af758c8e5d translations PR 20180306 (#8414) 2018-03-07 13:42:40 -05:00
Chris
e8943936c5 general cleanup (#8387) 2018-03-07 12:36:40 -06:00
Jesús Espino
fd9ee780ed Readding uasurfer library (#8420) 2018-03-07 09:56:24 -08:00
Jonathan
d448a6bef3 XYZ-87: GlobalRelay DM Exports do not Include Channel Name (#8275) 
* Adding ChannelMemberHistory table records when DM channels are created. This ensures that both participants in a DM are shown in compliance export, even if only one of them typed anything

* Direct/Group Message channels now get pretty display names for the purpose of compliance exports

* Fixed string formatting in t.Fatal calls

* Changed uses of ChannelMemberHistory over to ChannelMemberHistoryResult in tests. This should have been done as a part of the work in XYZ-110, but seems to have been missed in this branch for some reason
 2018-03-07 15:54:51 +00:00
Philippe GRANET
09713ff4ea Add addedUser IDs to render correctly in client based on teammate name display setting (#8400) 
See PLT-7776 on mattermost-webapp:
https://github.com/mattermost/mattermost-webapp/pull/353
 2018-03-07 21:00:35 +08:00
Chris
a434fe7637 register additional gob types to support arrays and dicts in post props (#8412) 2018-03-06 21:01:18 -05:00
Alex Moon
309594cedf [PLT-7574] Update and Simplify Compatibility Check and Replace UA Dependency (#7427) 
* Add fix to not run browser check on Mobile Browsers or the App

* remove non safari and IE checks

* Replace useragent checking dependency and update UA tests

* change some wording

* change dependancy again to one with compatible licence

* Fix typos and clarify wording

* fix typo and comvert tests to use array
 2018-03-06 21:22:07 +00:00
Derrick Anderson
a3320e0ce3 Uncomment upgrade code to 4.8 (#8409) 
* upgrade to 48

* fix upgrade bug
 2018-03-05 14:50:10 -05:00
Joram Wilander
6b3c9a480a Add preparatory upgrade code for 4.9 (#8408) 2018-03-05 14:39:49 -05:00
Joram Wilander
4a1802c039 MM-9664 Add invalidation metrics for store caches (#8340) 
* Add invalidation metrics for store caches

* Increment session invalidation metric

* Fix tests
 2018-03-05 10:35:26 -05:00
Jesse Hallam
fbff94f3be MM-8604: emit config/license websocket events (#8371) 2018-03-05 12:18:22 +00:00
Carlos Tadeu Panato Junior
fa98175a46 fix Mozilla typo (#8395) 2018-03-05 09:37:22 +00:00
Chris
4ebf974690 remove go Publish(...) idiom (#8373) 2018-03-02 16:49:18 +00:00
Christian Hoff
2b3b6051d2 PLT-7567: Integration of Team Icons (#8284) 
* PLT-7567: Integration of Team Icons

* PLT-7567: Read replica workaround, upgrade logic moved, more concrete i18n key

* PLT-7567: Read replica workaround, corrections

* PLT-7567: upgrade correction
 2018-03-01 19:11:44 +00:00
Chris
51c7198d53 fix linux cap header structure (#8389) 2018-03-01 15:16:23 +00:00
Carlos Tadeu Panato Junior
4b5541db46 [PLT-8024] Support LOGIN authentication method for SMTP (#8140) 
* [PLT-8024] Support LOGIN authentication method for SMTP

* added initial unit tests
 2018-03-01 12:58:35 +01:00
Carlos Tadeu Panato Junior
6e024c45b5 [PLT-8186] add support for ec2 instance profile authentication (#8243) 2018-02-28 23:12:11 +00:00
George Goldberg
d2b70b8671 Simplification of a Channel Members query. (#8345) 2018-02-28 23:07:09 +00:00
Chris
600528e1cf optimize lru purging (#8381) 2018-02-28 12:07:11 -08:00
Fede
2fba6fa799 Fix prerequisites checker so 1.10 > 1.9 (#8344) 
* Fix prerequisites checker so 1.10 > 1.9

* Check prerequisites sorting by dot separator
 2018-02-27 17:53:27 -05:00
Joram Wilander
2782602c6e Temporarily disable flaky TestSendMailUsingConfigAdvanced test (#8379) 
* Temporarily disable flaky TestSendMailUsingConfigAdvanced test

* Remove imports
 2018-02-27 13:07:31 -05:00
Christopher Speller
ae1acbda49 MM-9698 Fixing Minio with server side encryption. (#8367) 
* Fixig Minio with server side encryption.

* Add png file backend test
 2018-02-26 09:45:35 -05:00
Chris
f0f4f68def add individual platform packaging targets (#8366) 2018-02-26 02:48:56 -05:00
Christopher Speller
838295f82c Fix forward 80 to 443 to not bind on all interfaces. (#8360) 2018-02-23 18:33:36 -05:00
Derrick Anderson
babccba8f8 Merge branch 'merge47intomaster' 2018-02-23 15:34:04 -05:00
Derrick Anderson
4538857ae3 Merge remote-tracking branch 'origin/release-4.7' into merge47intomaster 2018-02-23 15:14:01 -05:00
Chris
55261a2b15 fix scheduled task race (#8355) 2018-02-23 12:56:32 -06:00
Joram Wilander
5fb4b1bc93 MM-8593 Default APIv3 to disabled for new installs (#8353) 
* Default APIv3 to disabled for new installs

* Add EnableAPIv3 setting to client config

* Enable APIv3 for needed tests
 2018-02-23 07:55:02 -08:00
Joram Wilander
4211a2bb3c Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352) 2018-02-23 10:08:35 -05:00