summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [MM-11593] Prevent user to remove from a direct channel (#9251)Saturnino Abril2018-08-213-0/+33
| | | | | | | | | | | | * prevent user to remove from a direct channel * only allow removing of a member in private or public channel
* | Adding Permissions check and reactions function to plugins API (#9273)Jesús Espino2018-08-204-0/+325
| | | | | | | | | | | | * Adding reactions functions * Adding permissions checking in the plugins api
* | Add ToJson() to PostActionIntegrationResponse (#9247)Hanzei2018-08-202-6/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Add FileInfo and get file []byte in plugin api (#9269)Elias Nahum2018-08-204-0/+122
| | | | | | | | | | | | | | | | * Add FileInfo and get file []byte in plugin api * Regenerated plugin mocks * Rename ReadFileAtPath to ReadFile
* | Add PostId to PostActionIntegrationRequest (#9270)Hanzei2018-08-182-0/+2
| |
* | Update default.json (#9256)Jason Blais2018-08-161-1/+2
| |
* | Merge release-5.2Carlos Tadeu Panato Junior2018-08-1617-314/+320
|\|
| * translations PR 20180813 (#9252)Elias Nahum2018-08-1515-307/+307
| | | | | | | | | | | | * translations PR 20180813 * Fix french translation
| * MM-11678: Split the cache for includeDeleted and not includeDeleted ↵Jesús Espino2018-08-141-2/+7
| | | | | | | | | | | | | | | | memberships requests (#9254) * MM-11678: Split the cache for includeDeleted and not includeDeleted memberships requests * Updating properly the cache on sucess
| * clarify CopyFileInfos godocs (#9243)Jesse Hallam2018-08-101-5/+6
| |
* | Add link to developer docs in readme/contributing.md (#9248)Jason Blais2018-08-142-1/+2
| | | | | | | | | | | | * Update README.md * Update CONTRIBUTING.md
* | Update mockery before generate mocks (#9250)Jesús Espino2018-08-141-3/+3
| |
* | Merge remote-tracking branch 'upstream/release-5.2' into ↵cpanato2018-08-104-14/+79
|\| | | | | | | release-5.2-daily-merge-20180810
| * MM-11382 Remove special handling of PluginSettings when loading config (#9234)Harrison Healey2018-08-102-6/+73
| | | | | | | | | | | | | | | | * MM-11382 Only override PluginSettings from environment when necessary * MM-11382 Remove special handling of PluginSettings when loading config * Add extra unit test
| * MM-11637: avoid stopping unstarted jobs (#9240)Jesse Hallam2018-08-092-8/+6
| | | | | | | | | | 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.
* | avoid t.Fatal() in tests (#9189)Jesse Hallam2018-08-0918-362/+153
| | | | | | | | | | | | 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".
* | Ignore link-local addresses in cluster advertisement (#9223)Daniel Malon2018-08-081-1/+1
| |
* | Merge remote-tracking branch 'upstream/release-5.2' into ↵cpanato2018-08-0845-103/+335
|\| | | | | | | release-5.2-daily-merge-20180808
| * MM-9747: Small fixes for attachments import (#9225)Jesús Espino2018-08-083-3/+60
| | | | | | | | | | | | * MM-9747: Small fixes for attachments import * Adding unit test RootId check in replies
| * fix plugintest example and docs (#9213)Jesse Hallam2018-08-083-48/+66
| |
| * MM-11384: Add system install date information to the client config (#9218)Jesús Espino2018-08-0837-38/+203
| | | | | | | | | | | | | | | | * MM-11384: Add system install date information to the client config * Fixing translation text * Fixes from Peer Review
| * Remove global-relay export command from the cli (#9226)Jesús Espino2018-08-081-10/+0
| |
| * try to fix the flaky test (#9231)Carlos Tadeu Panato Junior2018-08-071-4/+6
| |
* | Update serverside markdown parser to respect unicode and capitalized links ↵Harrison Healey2018-08-085-78/+173
| | | | | | | | (#9235)
* | Add preparatory upgrade code for 5.3.0 (#9224)Carlos Tadeu Panato Junior2018-08-081-0/+10
|/
* translations PR 20180802 (Adds Romanian) (#9210)Elias Nahum2018-08-068-53/+6418
| | | | | | * translations PR 20180802 * Fix romanian translation
* Uncomment upgrade for 5.2.0 (#9216)Carlos Tadeu Panato Junior2018-08-062-6/+6
|
* MM-11510: Adds delete at value to delete channel websocket event. (#9217)Martin Kraft2018-08-041-1/+4
|
* MM-11575: change plugin nil semantics (#9212)Jesse Hallam2018-08-035-165/+466
| | | | | | | | * change MessageWillBePosted nil return semantics * change FileWillBeUploaded nil return semantics * use LogDebug to verify plugin inputs vs. the confusing Delete(User|Team)
* Idiomatic error handling on team sql store (#9201)Jesús Espino2018-08-032-83/+121
|
* MM-11576: Allow to join and add members to archived channels (#9214)Jesús Espino2018-08-033-18/+0
|
* MM-11529: Allow to Leave an archived channel from the API (#9204)Jesús Espino2018-08-034-10/+22
| | | | | | * MM-11529: Allow to Leave an archived channel from the API * Remove the restriction to remove user from archive channel to yourself
* Feature/fileinfo create copy (#9198)dmitrysamuylovpharo2018-08-026-0/+127
| | | | | | | | * 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
* send channel wide push notification type when at-here is used (#9209)Elias Nahum2018-08-021-1/+1
|
* Remove accidential dependency (#9203)Christopher Speller2018-08-0112-4328/+2
|
* CSRF Token Implementation for Plugins (#9192)Daniel Schalla2018-08-0110-4/+126
| | | | | | | | | | | | | | | | | 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
* Update LICENSE.txt to include plugin/ under Apache License v2.0 (#9205)Jason Blais2018-08-011-1/+1
| | | | | 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
* MM-11521/MM-11522 Fix being able to create users with invalid emails through ↵Harrison Healey2018-08-0116-204/+274
| | | | | | | | | | | | | | 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
* Update NOTICE.txt (#9197)amyblais2018-08-011-0/+429
| | | | | | | | * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt
* Add missing diagnostics for v5.2 (#9200)Jason Blais2018-08-011-38/+47
| | | | | | * Update diagnostics.go * Fix gofmt
* MM-11175 Add logic to server to understand markdown images with dimensions ↵Harrison Healey2018-08-015-8/+322
| | | | (#9159)
* Migrate all the api4 to handle errors in idiomatic way (#9143)Jesús Espino2018-08-0117-375/+412
|
* Split app/import.go in multiple files (#9179)Jesús Espino2018-08-018-5868/+5924
|
* Fixed inconsistencies (#9120)der-test2018-08-011-4/+4
| | | | | | | | * Fixed inconsistencies See https://pre-release.mattermost.com/core/pl/339m9zipst8n7kc19fossntose * Update en.json
* translations PR 20180730 (#9191)Elias Nahum2018-08-0114-341/+1902
| | | | | | * translations PR 20180730 * Fix japanese
* MM-11420: plugins: compute bundle hash on load (#9172)Jesse Hallam2018-07-315-54/+58
| | | | | | | | | | | | * plugins: compute bundle hash on load Use this hash to bust client caches whenever the plugin bundle changes. * eliminate redundant pluginHandler * switch to 64-bit FNV-1a * Fix test
* Migrate notification_push_test to table testing (#9195)Jesús Espino2018-07-311-310/+509
|
* MM-11516: Check channel ID in URL param and Body are same. (#9185)George Goldberg2018-07-311-0/+6
|
* Adding support for code split plugins. (#9184)Christopher Speller2018-07-313-7/+18
|
* MM-10502: Only cluster master should run job schedulers. (#9174)George Goldberg2018-07-314-24/+80
| | | | | | | | * MM-10502: Only cluster master should run job schedulers. * Use sync.Map for thread safety. * Fix tests.