summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* gob register AppError (#9182)Jesse Hallam2018-07-311-0/+1
| | | | This allows plugin hooks to return the result of calling the API as an `error`.
* Add OAuth2 login hint for SAML (#9194)Joram Wilander2018-07-311-1/+7
|
* Save OAuth access token to DB for consistency with other flows (#9190)Joram Wilander2018-07-311-0/+7
|
* Add siteURL to WS origin check (#9183)Joram Wilander2018-07-301-0/+9
| | | | | | | | * Add siteURL to WS origin check * Handle subpath * Only add site URL if not *
* Fix build. (#9188)Christopher Speller2018-07-301-1/+0
|
* Pr 9039 (#9187)Martin Kraft2018-07-3033-187/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-11065: Allow to search and get archived channels from the API * Fixing more tests * Add some unit tests * Add includeDeleted parameter to session permissions check function * More test fixing * Adding archive channels list in channels search * Add restriction for archived channel edition * Reverting permissions checks modification * Changed the query parameter to include_deleted * Enable search archive channels as true by default * Adding tests for verify search on deleted channels * Allowing to override archive channels during the imports * Fixed test * Search in archive channels from the API must be explicitly requested * Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam * Back to ViewArchivedChannels config * Fixing tests * Reverting GetChannelByName parameter * Add include deleted parameter on GetChannel functions in plugins api * Fixing tests
* MM-11301: Validates listen address config value. (#9138)Martin Kraft2018-07-303-1/+108
| | | | | | | | | | * MM-11301: Validates listen address config value. * MM-11301: Adds some invalid port test cases. * MM-11301: Accept domain names. * MM-11301: Fix for max port.
* Login Hooks (#9177)Daniel Schalla2018-07-305-0/+285
| | | Tests; gofmt
* Split notifications file into different files (#9164)Jesús Espino2018-07-286-1779/+1828
|
* [MM-10621] Set createAt timestamp on file upload api call to secure upload ↵Saturnino Abril2018-07-283-5/+18
| | | | | | | | order of files (#9170) * set createAt timestamp on file upload api call to secure upload order of files * fix test on plugin hooks
* Implement OAuth2 implicit grant flow (#9178)Joram Wilander2018-07-276-12/+148
|
* Fix compile error caused by bad merge (#9176)Joram Wilander2018-07-271-1/+1
| | | | | | | | * Fix compile error caused by bad merge * Fix * Fix
* MM-11431: handle plugin deadlocks (#9167)Jesse Hallam2018-07-275-53/+267
| | | | | | | | | | | | | | | | | | | | | | * ensure plugin is always shutdown Once we call `.client.Client()` the plugin has started, and must be shut down. `newSupervisor` sometimes returned with an error (and without a reference to the supervisor), leaving the client running indefinitely. * Clarify the documentation to explain that plugin hooks will not trigger until `OnActivate` returns successfully, and will stop triggering just before `OnDeactivate` is called. * test for plugin deadlock * plugin/environment.go: switch to sync.Map From: https://golang.org/pkg/sync/#Map > If a goroutine holds a RWMutex for reading and another goroutine might call Lock, no goroutine should expect to be able to acquire a read lock until the initial read lock is released. In particular, this prohibits recursive read locking. This is to ensure that the lock eventually becomes available; a blocked Lock call excludes new readers from acquiring the lock. The previous `RWMutex` was not safe given that we effectively acquired read locks recursively (hook -> api -> hook). This worked up until we activated or deactivated plugins, tried to acquire a write lock, and the plugin used the API to effectively trigger another hook. Switching to sync.Map avoids this by divesting the need to lock at all, avoiding the potential for a recursive lock in the first place.
* s/mlog/log/ in apiRPCClient (#9171)Jesse Hallam2018-07-273-55/+55
| | | | | We never actually initialized `log` on apiRPCClient, and it can't log without making an RPC call anyway, so just switch to logging errors from the plugin to STDERR instead.
* Adding FileWillBeUploaded plugin hook (#9169)Christopher Speller2018-07-276-9/+203
| | | | | | | | | | | | | | * Adding file upload hook. * Adding hook test for FileWillBeUploaded * Some debugging fixes. * Fix typo. * Fixing double close * Fix capitalization on docs.
* Fix file streaming to close files. (#9168)Christopher Speller2018-07-263-7/+26
|
* MM-11160 Adding proper CORS support. (#9152)Christopher Speller2018-07-2612-35/+819
| | | | | | * Adding proper CORS support. * Better CORS tests.