summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'upstream/merge-release-5.3-20180903124813'cpanato2018-09-033-3/+144
|\ \
| * | Merge release-5.3Carlos Tadeu Panato Junior2018-09-033-3/+144
|/| | | |/
| * MM-11693 Allow connections to /plugins for interactive message buttons. (#9333)Christopher Speller2018-09-023-3/+144
* | add megacheck as makefile target (#9288)Daniel Schalla2018-09-0350-213/+182
|/
* Fix store cache invalidation for reactions (#9331)Harrison Healey2018-08-301-2/+2
* Invalidate store cache after making changes (#9211)Harrison Healey2018-08-303-10/+15
* MM-11710 Add a check to webhook messages to populate username from DM channel...Sudheer2018-08-301-1/+1
* bug fix: after and before search flags should not be inclusive of the selecte...Dmitry Samuylov2018-08-292-5/+17
* Remove testing imports from non-test code. (#9324)George Goldberg2018-08-292-59/+58
* Add GetLDAPUserAttributes method to the plugin API (#9326)Joram Wilander2018-08-294-0/+77
* add --username in the example for the commands (#9320)Carlos Tadeu Panato Junior2018-08-291-6/+6
* MM-11270: Forbid react/de-react in archived channels (#9323)Jesús Espino2018-08-293-43/+109
* 9304 added the attachments import to direct post (#9308)Pradeep Murugesan2018-08-293-3/+64
* translations PR 20180827 (#9317)Elias Nahum2018-08-2815-258/+762
* MM-10532: Add EnableSyncWithLdapIncludeAuth config (#9319)Jesús Espino2018-08-283-4/+11
* Feature/search after before on (#9219)Dmitry Samuylov2018-08-2811-36/+401
* Updating dependancies. (#9303)Christopher Speller2018-08-28255-5111/+11042
* MM-11327: Restrict Teams by Email (#9142)Gabe Van Engel2018-08-285-113/+273
* Adding IdAttribute setting for SAML (#9291)Jesús Espino2018-08-283-0/+8
* Update en.json typo (#9312)Cosmin M2018-08-271-1/+1
* Add debug-server task to make file to run mattermost using delve (#9290)Jesús Espino2018-08-271-0/+10
* Moving magic number to constant in team import (#9298)Jesús Espino2018-08-271-2/+3
* MM-11786: Adds API endpoint to retrieve redirect locations. (#9284)Martin Kraft2018-08-243-0/+81
* Fix sampledata reset LastPostAt when the channels are empty (#9295)Jesús Espino2018-08-241-1/+8
* translations PR 20180820 (#9277)Elias Nahum2018-08-241-12/+12
* Support for interactive menus in message attachments (#9285)Joram Wilander2018-08-244-8/+89
* If no origin header is set for WebSocket, do not fail upgrade (#9287)Joram Wilander2018-08-241-0/+4
* Merge release-5.2Carlos Tadeu Panato Junior2018-08-247-9/+29
|\
| * MM-11782: Make archived channels experimental and off-by-default. (#9281)George Goldberg2018-08-227-9/+29
* | MM-11572: Force correct order on messages generated in the bulk (#9244)Jesús Espino2018-08-246-7/+66
* | MM-11348: Add telemetry for advanced permissions. (#9249)George Goldberg2018-08-236-32/+226
* | Add/Remove translations (#9280)Jesús Espino2018-08-221-18/+42
* | [MM-11593] Prevent user to remove from a direct channel (#9251)Saturnino Abril2018-08-213-0/+33
* | Adding Permissions check and reactions function to plugins API (#9273)Jesús Espino2018-08-204-0/+325
* | Add ToJson() to PostActionIntegrationResponse (#9247)Hanzei2018-08-202-6/+61
* | Add FileInfo and get file []byte in plugin api (#9269)Elias Nahum2018-08-204-0/+122
* | 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
| * MM-11678: Split the cache for includeDeleted and not includeDeleted membershi...Jesús Espino2018-08-141-2/+7
| * 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 mockery before generate mocks (#9250)Jesús Espino2018-08-141-3/+3
* | Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-me...cpanato2018-08-104-14/+79
|\|
| * MM-11382 Remove special handling of PluginSettings when loading config (#9234)Harrison Healey2018-08-102-6/+73
| * MM-11637: avoid stopping unstarted jobs (#9240)Jesse Hallam2018-08-092-8/+6
* | avoid t.Fatal() in tests (#9189)Jesse Hallam2018-08-0918-362/+153
* | Ignore link-local addresses in cluster advertisement (#9223)Daniel Malon2018-08-081-1/+1
* | Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-me...cpanato2018-08-0845-103/+335
|\|