summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' into plugins-2JoramWilander2018-07-103-0/+12
| |\ \
| * | | Don't panic if plugin manifest does not have settings (#9086)Joram Wilander2018-07-101-2/+4
| * | | Adding ability for plugin system to respect the defaults listed in the plugin...Christopher Speller2018-07-094-20/+28
| * | | Merge branch 'master' into plugins-2JoramWilander2018-07-0740-8524/+2234
| |\ \ \
| * | | | First batch of new plugin api methods (#9022)Daniel Schalla2018-07-0610-16/+1215
| * | | | MM-10703 Adding blank request context to plugin hooks for future use. (#9043)Christopher Speller2018-07-0613-74/+890
| * | | | Add back enable/disable WS events (#9052)Joram Wilander2018-07-053-1/+21
| * | | | MM-11029 Adding plugin logging functionality. (#9034)Christopher Speller2018-07-0313-38/+407
| * | | | Merge branch 'master' into plugins-2JoramWilander2018-06-3023-735/+683
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into plugins-2JoramWilander2018-06-2747-26268/+12238
| |\ \ \ \ \
| * | | | | | MM-9674 Add plugin API for publishing custom WebSocket events (#8999)Joram Wilander2018-06-275-2/+49
| * | | | | | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-25303-9370/+52116
* | | | | | | Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-1037-660/+1201
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | fix TestInvitePeopleProvider test (#9084)Carlos Tadeu Panato Junior2018-07-101-0/+6
| * | | | | translations PR 20180709 (#9082)Elias Nahum2018-07-1013-620/+672
| * | | | | MM-11229: Fix invite people slash command and add test case. (#9074)George Goldberg2018-07-103-0/+48
| * | | | | MM-11228: Fix channel update/patch API endpoints. (#9073)George Goldberg2018-07-103-21/+104
| * | | | | MM-11189: Do not close the connection abruptly on too big emojis (#9071)Jesús Espino2018-07-101-0/+4
| * | | | | MM-11227: Fix group msg slash command. (#9070)George Goldberg2018-07-104-4/+102
| * | | | | MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)Christopher Speller2018-07-1010-6/+100
| * | | | | MM-11174: Fix /msg slash command. (#9059)George Goldberg2018-07-103-0/+42
| * | | | | Update custom url schemes error message to reflect what we actually support (...Harrison Healey2018-07-093-4/+4
| * | | | | MM-11110: Fixes CLI error message. (#9062)Martin Kraft2018-07-091-1/+1
| * | | | | MM-11194: Fix channel header slash command. (#9057)George Goldberg2018-07-083-4/+118
* | | | | | Add preparatory upgrade code for 5.2.0 (#9047)Carlos Tadeu Panato Junior2018-07-101-0/+10
* | | | | | Blacklist System as Username (#9060)Daniel Schalla2018-07-092-0/+2
| |_|_|_|/ |/| | | |
* | | | | [MM-10754] Remove unnecessary command_test route (#9050)Saturnino Abril2018-07-062-41/+81
* | | | | Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-0613-23/+207
|\| | | |
| * | | | MM-11106: Allow systeadmin webook to post to read only town square. (#9051)George Goldberg2018-07-063-12/+43
| * | | | MM-10766 - Replacing default profile image font (#8955)Asaad Mahmood2018-07-057-11/+117
| * | | | MM-11118: disallow deleting direct or group channels (#9054)Jesse Hallam2018-07-053-0/+47
* | | | | MM-10603: Ignore Redirects and Other Changes when Displaying Link Previews (#...Declan Freeman-Gleason2018-07-051-0/+5
* | | | | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-055-8/+178
|/ / / /
* | | | Uncomment upgrade for 5.1.0 (#9040)Carlos Tadeu Panato Junior2018-07-032-5/+4
* | | | Make sure diagnostic ID is loaded before client config. (#9032)George Goldberg2018-07-032-3/+3
* | | | Adding RootId information to MessageExport (#9030)Jesús Espino2018-07-032-0/+2
* | | | translations PR 20180702 (#9038)Elias Nahum2018-07-0314-8436/+1728
* | | | Disable Gfycat by default during Beta and move default keys to server (#9027)Jason Blais2018-07-033-8/+13
* | | | Add note on 5.0->4.10 downgrade in upgrade.go (#9029)George Goldberg2018-07-021-0/+13
| |_|/ |/| |
* | | Ignore | characters in postgres channel search (#9019)Joram Wilander2018-06-302-0/+15
* | | redirect, vs. proxy, 80->443 without LE enabled (#9020)Jesse Hallam2018-06-291-8/+16
* | | Make import compatible with scheme-roles. (#9028)George Goldberg2018-06-292-6/+162
* | | MM-10980: Conditionally filteres User json properties. (#9018)Martin Kraft2018-06-292-2/+12
* | | Fix a really rare race condition in the migration scheduler. (#9000)George Goldberg2018-06-291-1/+1
* | | remove redundant checks in build.mk (#9015)Jesse Hallam2018-06-291-12/+0
* | | subpath: rewrite manifest.json too (#9017)Jesse Hallam2018-06-292-11/+231
* | | add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-287-68/+88
* | | Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-283-618/+90
* | | Reset status to away after web conn disconnect if necessary (#8988)Joram Wilander2018-06-274-9/+68
| |/ |/|
* | Gfycat integration (#8971)Kenny Au2018-06-273-0/+21