IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,915 Commits 845 Branches 1,202 Tags
c2ab85e0a36af24ee804c1d140cfe216022a4e45
Commit Graph

9915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Goldberg
c2ab85e0a3 MM-10591: Well known error for all scheme endpoints pre-migration. (#8812) 2018-05-17 12:48:18 +01:00
George Goldberg
b9b76b275a MM-10234: Make CLI roles command advanced-permissions aware. (#8771) 
* MM-10234: Make CLI roles command advanced-permissions aware.

* Fix for loop scope.

* Fix style.
 2018-05-17 10:18:49 +01:00
Martin Kraft
f1a830ce9a Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-16 14:45:46 -04:00
George Goldberg
16bbbc2abc Fix build failure from bad merge. 2018-05-16 12:02:43 +01:00
Ugurcan Turkdogan
02f8c18f40 Update email notification subject line and contents for Group Messages (#8689) 
Reordered notification strings

MM-10335 Changed uppercase CHANNEL to Lowercase Channel, added @ sign before username on notifications

Added @ sign in front of username in all email notifications.
Capitalized Direct Message and Group Message in email notifications.
Fixed the issue with long group message names.

Removed executable bit
 2018-05-15 16:43:59 -04:00
Christopher Speller
df6a7f8b19 MM-10249 Adding plugin ability to intercept posts before they reach the DB. (#8791) 
* Adding plugin ability to intercept posts before they reach the DB.

* s/envoked/invoked/
 2018-05-15 13:33:47 -07:00
Derrick Anderson
fbbe1f7cef Merge branch 'merge410rc5' 2018-05-15 11:54:24 -04:00
Derrick Anderson
228bc4bd1d Merge remote-tracking branch 'origin/release-4.10' into merge410rc5 2018-05-15 11:19:27 -04:00
Martin Kraft
f82cc7896d Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-15 07:45:28 -04:00
Elias Nahum
9301e575c8 translations PR 20180511 (#8774) 
* translations PR 20180511

* Fix bad translations
v4.10.0 v4.10.0-rc5 v4.10.0-rc4 		2018-05-14 16:05:37 -04:00
amyblais
77718928b7 Updating NOTICE.txt (#8732) 
* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt
 2018-05-14 16:04:10 -04:00
Jesse Hallam
f523a21e6d drop 401s from info to debug (#8778) 2018-05-14 15:02:32 -04:00
Jesse Hallam
a1656dffa9 MM-10201: querystring for get slash commands (#8779) 
* pass GET slash command payloads through query string

Previously, both GET and POST requests received the payload via the
body, but this was incorrect for GET requests. Now, the payloads for GET
requests is sent via the query string.

* reorder tests for clarity

* switch command tests to use httptest servers

* restore original test command endpoints
 2018-05-14 13:24:22 -04:00
Joram Wilander
6a9aa855d1 Move SAML endpoints out of api package (#8780) 2018-05-14 11:27:30 -04:00
George Goldberg
51bd710ecd MM-9728: Online migration for advanced permissions phase 2 (#8744) 
* MM-9728: Online migration for advanced permissions phase 2

* Add unit tests for new store functions.

* Move migration specific code to own file.

* Add migration state function test.

* Style fixes.

* Add i18n strings.

* Fix mocks.

* Add TestMain to migrations package tests.

* Fix typo.

* Fix review comments.

* Fix up the "Check if migration is done" check to actually work.
 2018-05-14 15:59:04 +01:00
Joram Wilander
47250c6629 Refactor context out of API packages (#8755) 
* Refactor context out of API packages

* Update function names per feedback

* Move webhook handlers to web and fix web tests

* Move more webhook tests out of api package

* Fix static handler
 2018-05-14 10:24:58 -04:00
Jesse Hallam
7e7c551987 MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762) 2018-05-14 09:43:06 -04:00
Carlos Tadeu Panato Junior
527bf9d3d3 [MM-9720] fix bugs when trying to change for a in use email and check the number of parameters (#8772) v4.10.0-rc3 2018-05-11 12:58:03 -04:00
Saturnino Abril
4ce37601a1 add notification when @user, @here, @all and @channel has colon ":" at the end (#8760) 2018-05-11 12:57:20 -04:00
Jesse Hallam
b4db76cedb fix mlog-ing before initialized (#8753) 
Dump mlog to STDOUT before initialized, to allow for logging failures
that occur due to config parsing, etc.

Fix file logging to honour logger.FileJson instead of copying the
logger.ConsoleJson setting.
 2018-05-11 12:56:54 -04:00
Joram Wilander
91c9981563 More potential panic fixes (#8776) 2018-05-11 11:56:02 -04:00
Carlos Tadeu Panato Junior
0dbaa2d032 [MM-10458] Change system response to "Could not find the channel" - bug fix (#8738) 
* [MM-10458] Change system response to "Could not find the channel" when trying to invite user to private channel you can't see

* add another check to check if user have permission to add another in pvt channel
 2018-05-11 11:20:47 -04:00
Derrick Anderson
c9196af23e Merge branch 'merge410rc2' 2018-05-11 10:56:38 -04:00
Derrick Anderson
52674eb4c7 add s3 test back in for master 2018-05-11 10:44:42 -04:00
Derrick Anderson
e3ea27c301 Merge release-4.10 with master 2018-05-11 10:17:59 -04:00
Martin Kraft
91557bbd97 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-11 08:05:23 -04:00
Jesse Hallam
2b27e12445 MM-10188: expect io.Reader in FileBackend.WriteFile (#8765) 
This is a reworked set of changes originally from @josephGuo to begin
reducing the duplicated memory required when uploading files.
 2018-05-10 15:16:33 -07:00
Joram Wilander
21d3b247d9 Comment out problematic TestS3TestConnection test (#8770) v4.10.0-rc2 2018-05-10 15:31:23 -04:00
Joram Wilander
8449982576 Attempt to fix hub nil panic (#8766) 2018-05-10 14:17:01 -04:00
Daniel Schalla
7fa1c6c4ba Add Ping Timeout Signal for WebSocket Client (#8666) 
Import Order

gofmt

gofmt

gofmt

Renamed Const to make Unit more obvious

Renamed Const to make Unit more obvious #2
 2018-05-10 12:51:34 -04:00
Christopher Speller
d8dd271e43 MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID without losing their account (#8756) 
* Adding LoginIdAttribute

* Modifying LDAP to use loginIDAttribute.

* Adding IDAttribute migration and AD objectGUID support.

* Removing unused idea.

* Fix typo.
 2018-05-10 09:46:09 -07:00
Joram Wilander
68340d4715 Prevent divide by zero if there are no hubs (#8763) 2018-05-10 11:22:10 -04:00
Carlos Tadeu Panato Junior
823b22c403 fix test and add new (#8758) 2018-05-10 08:43:49 -04:00
George Goldberg
11c60ea41a Merge branch 'master' into advanced-permissions-phase-2 2018-05-10 12:03:51 +01:00
Carlos Tadeu Panato Junior
db6b8f6238 fix test and add new (#8759) 2018-05-10 17:56:11 +08:00
Christopher Speller
454c113b4e Removing bad test. 2018-05-09 18:03:28 -07:00
Martin Kraft
2eed7e4ebf Fixes incorrect MiB size. (#8750) 2018-05-09 17:18:54 -04:00
Martin Kraft
d3e14a1bf8 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-09 15:00:07 -04:00
Harrison Healey
a752d7de5a MM-10495 Updated user agent detection to match output of previous library (#8748) 
* MM-10495 Updated user agent detection to match output of previous library

* Fixed missing license header
 2018-05-09 12:25:03 -04:00
Derrick Anderson
c1853c7f40 prep code for 5.0 (#8743) 2018-05-08 09:27:37 -04:00
Jonathan Villemaire-Krajden
6c3d1fc1f8 Fix empty GOPATH behaviour in Makefile (#8724) 2018-05-07 07:04:09 -07:00
Joram Wilander
09c6770885 Add IncrementClusterEventType function to metrics interface (#8728) v4.10.0-rc1 2018-05-04 14:59:28 -07:00
Derrick Anderson
e555b7454d Uncomment upgrade for 4.10 (#8727) 
* uncomment upgrade code

* ping jenkins

* add 4.10.0 to version.go
 2018-05-04 17:01:14 -04:00
Harrison Healey
fc513a9e61 Added missing i18n strings for files and email batching (#8700) 
* Added missing i18n strings for files and email batching

* Added more fields to log messages
 2018-05-04 16:11:15 -04:00
Jesús Espino
7c680cacab MM-10319: Use normalized email for Saml (migration) (#8711) 2018-05-04 16:10:43 -04:00
Saturnino Abril
30fd4a2951 update permission of converting a channel from public to private to allow team admin (#8723) 2018-05-05 02:16:00 +08:00
Martin Kraft
37b3805ca6 Removes .vscode dir. (#8721) 2018-05-04 08:44:48 -07:00
Saturnino Abril
5000eac24f respect image orientation before saving height and width of FileInfo (#8710) 2018-05-04 01:02:22 +08:00
Martin Kraft
14b65b990c MM-10393: Fix for tracking active vs inactive users. (#8706) 2018-05-03 16:00:33 +02:00
Harrison Healey
3b138c8b16 MM-10189 Fixed inconsistency when using environment variables for MessageExportSettings (#8705) 2018-05-03 09:55:03 -04:00