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
10,227 Commits 845 Branches 1,202 Tags
4de2e5206e23ee268b38f071ecd8fcbea0bbc80a
Commit Graph

10227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joram Wilander
4de2e5206e Support for interactive menus in message attachments (#9285) 2018-08-24 11:16:17 +01:00
Joram Wilander
9599f1a52f If no origin header is set for WebSocket, do not fail upgrade (#9287) 2018-08-24 11:09:48 +01:00
Carlos Tadeu Panato Junior
5876b52ecd Merge release-5.2 2018-08-24 11:36:39 +02:00
Jesús Espino
bba3bbd9f3 MM-11572: Force correct order on messages generated in the bulk (#9244) 2018-08-24 09:53:44 +02:00
George Goldberg
8bbee74ed8 MM-11348: Add telemetry for advanced permissions. (#9249) 2018-08-23 11:48:57 +01:00
George Goldberg
d2945cdd77 MM-11782: Make archived channels experimental and off-by-default. (#9281) 
* MM-11782: Make archived channels experimental and off-by-default.

* Fix test.
v5.2.1 v5.2.1-rc1 		2018-08-22 21:12:51 +02:00
Jesús Espino
dc4d009c78 Add/Remove translations (#9280) 2018-08-22 08:25:18 -04:00
Saturnino Abril
f16687f83c [MM-11593] Prevent user to remove from a direct channel (#9251) 
* prevent user to remove from a direct channel

* only allow removing of a member in private or public channel
 2018-08-21 20:53:32 +08:00
Jesús Espino
cea1796f06 Adding Permissions check and reactions function to plugins API (#9273) 
* Adding reactions functions

* Adding permissions checking in the plugins api
 2018-08-20 09:22:08 -07:00
Hanzei
56d92de3f2 Add ToJson() to PostActionIntegrationResponse (#9247) 
* Add ToJson() to PostActionIntegrationResponse

This commits adds a ToJson() methode to PostActionIntegrationResponse.

It also adds tests for other ToJson() methods

* Add PostActionIntegrationResponseFromJson function

* Add PostActionIntegrationRequesteFromJson() function

* Fix test names

* Add testcase
 2018-08-20 09:21:16 -07:00
Elias Nahum
0aa0adb911 Add FileInfo and get file []byte in plugin api (#9269) 
* Add FileInfo and get file []byte in plugin api

* Regenerated plugin mocks

* Rename ReadFileAtPath to ReadFile
 2018-08-20 09:18:25 -07:00
Hanzei
c2f2fda8a1 Add PostId to PostActionIntegrationRequest (#9270) 2018-08-18 08:35:32 -04:00
Jason Blais
97d8470a36 Update default.json (#9256) 2018-08-16 06:33:37 -07:00
Carlos Tadeu Panato Junior
f24f06c101 Merge release-5.2 2018-08-16 11:40:46 +02:00
Elias Nahum
43483805ea translations PR 20180813 (#9252) 
* translations PR 20180813

* Fix french translation
v5.2.0 v5.2.0-rc6 v5.2.0-rc5 		2018-08-15 10:09:26 +02:00
Jesús Espino
e39ebd0883 MM-11678: Split the cache for includeDeleted and not includeDeleted memberships requests (#9254) 
* MM-11678: Split the cache for includeDeleted and not includeDeleted memberships requests

* Updating properly the cache on sucess
 2018-08-14 19:30:27 +02:00
Jason Blais
ffb1d8c798 Add link to developer docs in readme/contributing.md (#9248) 
* Update README.md

* Update CONTRIBUTING.md
 2018-08-14 12:11:37 -04:00
Jesús Espino
54846fdad2 Update mockery before generate mocks (#9250) 2018-08-14 12:10:57 -04:00
Jesse Hallam
687700a989 clarify CopyFileInfos godocs (#9243) v5.2.0-rc4 v5.2.0-rc3 2018-08-10 17:21:37 +02:00
cpanato
620d55810d Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-merge-20180810 2018-08-10 15:03:18 +02:00
Harrison Healey
4299ef312b MM-11382 Remove special handling of PluginSettings when loading config (#9234) 
* MM-11382 Only override PluginSettings from environment when necessary

* MM-11382 Remove special handling of PluginSettings when loading config

* Add extra unit test
 2018-08-10 10:10:29 +02:00
Jesse Hallam
d8c8a19d35 avoid t.Fatal() in tests (#9189) 
I've been burned a few times by tests that simply fatal, requiring me to
run another build to learn more about what the mismatch was. Avoid this.

This is part of a long running goal of mine to make testing "better".
 2018-08-09 11:26:38 +02:00
Jesse Hallam
7649488a26 MM-11637: avoid stopping unstarted jobs (#9240) 
The new locking primitives in 5.2 around jobs assume the
worker/scheduler was actually started, so don't try to stop if not
started.
 2018-08-09 11:04:49 +02:00
Daniel Malon
0bbabd137b Ignore link-local addresses in cluster advertisement (#9223) 2018-08-08 20:40:53 -07:00
cpanato
ae891321ad Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-merge-20180808 2018-08-08 13:53:10 +02:00
Harrison Healey
99cf15b56e Update serverside markdown parser to respect unicode and capitalized links (#9235) 2018-08-08 12:13:04 +02:00
Jesús Espino
5fbec91c35 MM-9747: Small fixes for attachments import (#9225) 
* MM-9747: Small fixes for attachments import

* Adding unit test RootId check in replies
 2018-08-08 12:10:05 +02:00
Jesse Hallam
7475cd260a fix plugintest example and docs (#9213) 2018-08-08 12:07:38 +02:00
Jesús Espino
6bf09e2c34 MM-11384: Add system install date information to the client config (#9218) 
* MM-11384: Add system install date information to the client config

* Fixing translation text

* Fixes from Peer Review
 2018-08-08 12:04:36 +02:00
Jesús Espino
3b640cd51b Remove global-relay export command from the cli (#9226) 2018-08-08 12:04:16 +02:00
Carlos Tadeu Panato Junior
935f0c5ff9 Add preparatory upgrade code for 5.3.0 (#9224) 2018-08-08 11:35:51 +02:00
Carlos Tadeu Panato Junior
c11ebddbfb try to fix the flaky test (#9231) 2018-08-07 19:52:51 +02:00
Elias Nahum
9bf01f1401 translations PR 20180802 (Adds Romanian) (#9210) 
* translations PR 20180802

* Fix romanian translation
v5.2.0-rc2 v5.2.0-rc1 		2018-08-06 11:13:46 +02:00
Carlos Tadeu Panato Junior
fbdf337dcd Uncomment upgrade for 5.2.0 (#9216) 2018-08-06 09:45:36 +02:00
Martin Kraft
30ded2489f MM-11510: Adds delete at value to delete channel websocket event. (#9217) 2018-08-04 12:58:41 +02:00
Jesse Hallam
04749027f6 MM-11575: change plugin nil semantics (#9212) 
* change MessageWillBePosted nil return semantics

* change FileWillBeUploaded nil return semantics

* use LogDebug to verify plugin inputs vs. the confusing Delete(User|Team)
 2018-08-03 13:15:51 -04:00
Jesús Espino
1ecb98d9f5 Idiomatic error handling on team sql store (#9201) 2018-08-03 17:13:50 +02:00
Jesús Espino
61f98d92fa MM-11576: Allow to join and add members to archived channels (#9214) 2018-08-03 17:13:02 +02:00
Jesús Espino
8cc4f27f7c MM-11529: Allow to Leave an archived channel from the API (#9204) 
* MM-11529: Allow to Leave an archived channel from the API

* Remove the restriction to remove user from archive channel to yourself
 2018-08-03 10:44:32 +02:00
dmitrysamuylovpharo
7a731d2bd1 Feature/fileinfo create copy (#9198) 
* Initial implementation of a CopyFileInfos function that creates new FileInfo objects copied from provided FileIds with the provided user as the creator and not linked to a post yet. This can subsequently be used to copy existing attachments from another post to attach to a new post without having to re-upload the actual files

* added a unit test for the CopyFileInfos function

* resolving pull request suggestions
 2018-08-02 10:37:31 -04:00
Elias Nahum
b728b16f90 send channel wide push notification type when at-here is used (#9209) 2018-08-02 09:40:46 -04:00
Christopher Speller
c8013d4982 Remove accidential dependency (#9203) 2018-08-01 15:38:56 -07:00
Daniel Schalla
2936dc87d0 CSRF Token Implementation for Plugins (#9192) 
deleted test config

fix test config

Dont wipe the session token for plugins

Simplified Tokens; Generate CSRF for other sessions

Remove CSRF from Access Token; Remove Getter/Setter from Context

fix removed setter

remove getcsrf helper from plugin api

enforce csrf only for cookie auth
 2018-08-01 15:16:04 -07:00
Jason Blais
90e84d76ef Update LICENSE.txt to include plugin/ under Apache License v2.0 (#9205) 
We are removing the mention of the webapp/ directories as they have been moved to their own repository that is entirely under Apache License v2.0.

https://mattermost.atlassian.net/browse/MM-11430
 2018-08-01 12:34:03 -07:00
Harrison Healey
c34b30a6e7 MM-11521/MM-11522 Fix being able to create users with invalid emails through API (#9199) 
* MM-11522 Fix being able to create users with invalid emails through API

* Ensure store tests are using valid emails

* Add missing license header

* Remove invalid test case

* Fix TestUpdateOAuthUserAttrs
 2018-08-01 15:18:14 -04:00
amyblais
a8cc646eed Update NOTICE.txt (#9197) 
* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt
 2018-08-01 12:11:25 -07:00
Jason Blais
b59044e889 Add missing diagnostics for v5.2 (#9200) 
* Update diagnostics.go

* Fix gofmt
 2018-08-01 11:17:24 -07:00
Harrison Healey
ecfba2c2e9 MM-11175 Add logic to server to understand markdown images with dimensions (#9159) 2018-08-01 11:43:58 -04:00
Jesús Espino
d81a61398d Migrate all the api4 to handle errors in idiomatic way (#9143) 2018-08-01 16:55:18 +02:00
Jesús Espino
1f168263a2 Split app/import.go in multiple files (#9179) 2018-08-01 15:45:26 +02:00