summaryrefslogtreecommitdiffstats
Commit message (Collapse)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 ↵Christopher Speller2018-07-094-20/+28
| | | | | | | | | | | | | | | | plugin manifest. (#9066)
| * | | Merge branch 'master' into plugins-2JoramWilander2018-07-0740-8524/+2234
| |\ \ \
| * | | | First batch of new plugin api methods (#9022)Daniel Schalla2018-07-0610-16/+1215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update api mocks Generated new hooks ChannelHasJoinedChannel Implementation User Left Team/Channel Hook; User Joined Team Hook Implementation Update RPC Client and Mocks gofmt go tests fix Add Config API Methods codegne Add Channel Has Been Created Hook Fix ChannelHasBeenCreated hook fix missing context param fix duplicate hooks; remove redudandcy
| * | | | MM-10703 Adding blank request context to plugin hooks for future use. (#9043)Christopher Speller2018-07-0613-74/+890
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding blank request context to plugin hooks for future use. * Rename RequestContext to Context * Adding context to ServeHTTP and ExecuteCommand * Fixing import cycle in test.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Capturing stdout, stderr of plugins in logs. * Cleanup go-plugin debug logs. * Adding logging to plugin API * Generating mocks. * godoc convention
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add plugin API for publishing custom WebSocket events * Add clearer payload comment * Update comment
| * | | | | | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-25303-9370/+52116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving plugins to use hashicorp go-plugin. * Tweaks from feedback.
* | | | | | | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-1037-660/+1201
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | release-5.1-daily-merge-20180710
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding setting to disable email invitations. * Adding a setting and rate limiting for email invite sending. * Modifying email rate limit to 20/user/hour * Adding EnableEmailInvitations to client side config and command.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | (#9061)
| * | | | | 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
| |_|_|_|/ |/| | | | | | | | | adapted tests
* | | | | [MM-10754] Remove unnecessary command_test route (#9050)Saturnino Abril2018-07-062-41/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove unnecessary command_test route * replaced localhost with ts.URL
* | | | | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-0613-23/+207
|\| | | | | | | | | | | | | | | | | | | release-5.1-daily-merge-20180706
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updating default profile pic font * Updating profile image font * Updating test * Use new default font if configured for old one * Update OFL.txt
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#9025) * Don't use redirected URL in link preview. * Only show preview if OG data is provided.
* | | | | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-055-8/+178
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update default.json * Update diagnostics.go * Added default Gfycat API credentials to server * Fixed default Gfycat credentials
* | | | 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
| | | | | | | | | The code incorrectly got refactored to proxy instead of forward, deviating from the behaviour when LE is enabled.
* | | Make import compatible with scheme-roles. (#9028)George Goldberg2018-06-292-6/+162
| | | | | | | | | | | | | | | This doesn't introduce new fields as we would then break backwards compatability with old "roles" fields. We can add custom fields if/when we go to "version 2" of the bulk import format.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update e.json string names and remove console log reorder variables update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns Add MaxLifetimeConns to test Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds Update time passed to SetConnMaxLifetime Revert "Update time passed to SetConnMaxLifetime" This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f. update en.json Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000
* | | Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-283-618/+90
| | | | | | | | | | | | | | | * Add English missed texts to i18n/en.json * Update en.json
* | | 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
| | | | | | | | | | | | * Gfycat integration * Added gfycat api credentials to config.