Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into plugins-2 | JoramWilander | 2018-07-10 | 3 | -0/+12 |
|\ | |||||
| * | Add preparatory upgrade code for 5.2.0 (#9047) | Carlos Tadeu Panato Junior | 2018-07-10 | 1 | -0/+10 |
| | | |||||
| * | Blacklist System as Username (#9060) | Daniel Schalla | 2018-07-09 | 2 | -0/+2 |
| | | | | | | adapted tests | ||||
* | | Don't panic if plugin manifest does not have settings (#9086) | Joram Wilander | 2018-07-10 | 1 | -2/+4 |
| | | |||||
* | | Adding ability for plugin system to respect the defaults listed in the ↵ | Christopher Speller | 2018-07-09 | 4 | -20/+28 |
| | | | | | | | | plugin manifest. (#9066) | ||||
* | | Merge branch 'master' into plugins-2 | JoramWilander | 2018-07-07 | 40 | -8524/+2234 |
|\| | |||||
| * | [MM-10754] Remove unnecessary command_test route (#9050) | Saturnino Abril | 2018-07-06 | 2 | -41/+81 |
| | | | | | | | | | | | | * remove unnecessary command_test route * replaced localhost with ts.URL | ||||
| * | Merge remote-tracking branch 'upstream/release-5.1' into ↵ | cpanato | 2018-07-06 | 13 | -23/+207 |
| |\ | | | | | | | | | | release-5.1-daily-merge-20180706 | ||||
| | * | MM-11106: Allow systeadmin webook to post to read only town square. (#9051) | George Goldberg | 2018-07-06 | 3 | -12/+43 |
| | | | |||||
| | * | MM-10766 - Replacing default profile image font (#8955) | Asaad Mahmood | 2018-07-05 | 7 | -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 Hallam | 2018-07-05 | 3 | -0/+47 |
| | | | |||||
| * | | MM-10603: Ignore Redirects and Other Changes when Displaying Link Previews ↵ | Declan Freeman-Gleason | 2018-07-05 | 1 | -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 Wilander | 2018-07-05 | 5 | -8/+178 |
| |/ | | | | | | | | | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config | ||||
| * | Uncomment upgrade for 5.1.0 (#9040) | Carlos Tadeu Panato Junior | 2018-07-03 | 2 | -5/+4 |
| | | |||||
| * | Make sure diagnostic ID is loaded before client config. (#9032) | George Goldberg | 2018-07-03 | 2 | -3/+3 |
| | | |||||
| * | Adding RootId information to MessageExport (#9030) | Jesús Espino | 2018-07-03 | 2 | -0/+2 |
| | | |||||
| * | translations PR 20180702 (#9038) | Elias Nahum | 2018-07-03 | 14 | -8436/+1728 |
| | | |||||
| * | Disable Gfycat by default during Beta and move default keys to server (#9027) | Jason Blais | 2018-07-03 | 3 | -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 Goldberg | 2018-07-02 | 1 | -0/+13 |
| | | |||||
* | | First batch of new plugin api methods (#9022) | Daniel Schalla | 2018-07-06 | 10 | -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 Speller | 2018-07-06 | 13 | -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 Wilander | 2018-07-05 | 3 | -1/+21 |
| | | |||||
* | | MM-11029 Adding plugin logging functionality. (#9034) | Christopher Speller | 2018-07-03 | 13 | -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-2 | JoramWilander | 2018-06-30 | 23 | -735/+683 |
|\| | |||||
| * | Ignore | characters in postgres channel search (#9019) | Joram Wilander | 2018-06-30 | 2 | -0/+15 |
| | | |||||
| * | redirect, vs. proxy, 80->443 without LE enabled (#9020) | Jesse Hallam | 2018-06-29 | 1 | -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 Goldberg | 2018-06-29 | 2 | -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 Kraft | 2018-06-29 | 2 | -2/+12 |
| | | |||||
| * | Fix a really rare race condition in the migration scheduler. (#9000) | George Goldberg | 2018-06-29 | 1 | -1/+1 |
| | | |||||
| * | remove redundant checks in build.mk (#9015) | Jesse Hallam | 2018-06-29 | 1 | -12/+0 |
| | | |||||
| * | subpath: rewrite manifest.json too (#9017) | Jesse Hallam | 2018-06-29 | 2 | -11/+231 |
| | | |||||
| * | add MaxLifetimeconns to server (#9004) | Jerry Kurian | 2018-06-28 | 7 | -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 Espino | 2018-06-28 | 3 | -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 Wilander | 2018-06-27 | 4 | -9/+68 |
| | | |||||
* | | Merge branch 'master' into plugins-2 | JoramWilander | 2018-06-27 | 47 | -26268/+12238 |
|\| | |||||
| * | Gfycat integration (#8971) | Kenny Au | 2018-06-27 | 3 | -0/+21 |
| | | | | | | | | | | | | * Gfycat integration * Added gfycat api credentials to config. | ||||
| * | MM-10910 fix join and open channel commands to work with tilde (#8984) | Sudheer | 2018-06-27 | 2 | -2/+97 |
| | | | | | | | | | | | | | | | | * MM-10910 fix join and open channel commands to work with tilde * Fix lint * Add basic tests for command_join | ||||
| * | translations PR 20180625 (#8998) | Elias Nahum | 2018-06-27 | 14 | -26173/+11561 |
| | | |||||
| * | Lock bulk importing to master database node (#9012) | Joram Wilander | 2018-06-27 | 9 | -1/+57 |
| | | |||||
| * | Simplify oauth (#8972) | Emil Velikov | 2018-06-26 | 4 | -28/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused OauthProvider::GetIdentifier Signed-off-by: Emil Velikov <emil.velikov@collabora.com> * Reuse gitlab's getAuthData() instead of open-coding it Signed-off-by: Emil Velikov <emil.velikov@collabora.com> * Remove OauthProvider::GetAuthDataFromJson interface The data is already available via GetUserFromJson().AuthData Signed-off-by: Emil Velikov <emil.velikov@collabora.com> | ||||
| * | MM-11034: Reply properly to incomming webhooks on errors (#9010) | Jesús Espino | 2018-06-26 | 2 | -2/+8 |
| | | |||||
| * | MM-10833: send down computed channel props (#8953) | Jesse Hallam | 2018-06-26 | 6 | -54/+411 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10833: send down computed channel props This allows channel headers to reference channel mentions for a client that doesn't already know about the channels in question. We intentionally don't send down the props for the autocomplete and search endpoints since they aren't used in that context, and would add unnecessary overhead. * update channel props on patch * revert to treating channel purpose as plaintext | ||||
| * | MM-11008: Fix translation and change the code to be auto-extracted (#9009) | Jesús Espino | 2018-06-26 | 2 | -4/+12 |
| | | |||||
| * | Add Purpose as a searchable field (#8067) | Chris Duarte | 2018-06-26 | 3 | -3/+47 |
| | | | | | | | | | | | | | | | | | | | | * Add Purpose as a searchable field * Add New Index and Remove old for Channels * Include Purpose in FullTextSearch Clause * Move removeIndex for Channels into upgrade.go | ||||
| * | Update diagnostics.go (#8989) | Jason Blais | 2018-06-26 | 1 | -0/+7 |
| | | |||||
| * | MM-10700 - Updating default image preview size (#9002) (#9003) | Joram Wilander | 2018-06-26 | 1 | -1/+1 |
| | | |||||
| * | MM-10269: Make jobserver work without restart. (#9005) | George Goldberg | 2018-06-26 | 2 | -0/+5 |
| | | |||||
* | | MM-9674 Add plugin API for publishing custom WebSocket events (#8999) | Joram Wilander | 2018-06-27 | 5 | -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 Speller | 2018-06-25 | 303 | -9370/+52116 |
|/ | | | | | | * Moving plugins to use hashicorp go-plugin. * Tweaks from feedback. | ||||
* | Implementation of File Exists Function; Delete FileInfos upon Permanent User ↵ | Daniel Schalla | 2018-06-25 | 11 | -0/+270 |
| | | | | | | | Delete (#8958) Check if file was deleted on FS Warning message if file couldnt be removed |