Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 | ||||
* | MM-10570: Make permissions reset command clear custom role assignments. (#8976) | George Goldberg | 2018-06-25 | 12 | -1/+489 |
| | |||||
* | Fix plugins serving after subpath changes (#8982) | Joram Wilander | 2018-06-22 | 1 | -1/+1 |
| | |||||
* | MM-8716: Security Update Check URL should have recognisable name. (#8983) | George Goldberg | 2018-06-22 | 1 | -1/+1 |
| | |||||
* | MM-8810: Add CSV Compliance export (#8966) | Jesús Espino | 2018-06-22 | 11 | -30/+129 |
| | | | | | | | | | | | | * MM-8810: Add CSV Compliance export * Only allowing to schedule actiances export throught the cli * De-duplicating some code * Fixes on texts * Fixes on translations | ||||
* | MM-10934 Update server dependencies. (#8981) | Christopher Speller | 2018-06-21 | 270 | -13474/+31365 |
| | | | | | | * Changing throttled import path. * Upgrading dependencies. | ||||
* | Using i18n extract to generate the i18n/en.json file (#8980) | Jesús Espino | 2018-06-21 | 1 | -2105/+761 |
| | | | | | | * Sort translations * Added untranslated and removed unussed strings | ||||
* | MM-10370: serve subpath (#8968) | Jesse Hallam | 2018-06-21 | 14 | -148/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | * factor out GetSubpathFromConfig * mv web/subpath.go to utils/subpath.go * serve up web, api and ws on /subpath if configured * pass config to utils.RenderWeb(App)?Error This allows the methods to extract the configured subpath and redirect to the appropriate `/subpath/error` handler. * ensure GetSubpathFromConfig returns trailing slashes deterministically * fix error 404 handling * redirect /subpath to /subpath/ This is necessary for the static handler to match, otherwise none of the registered routes find anything. This also makes it no longer necessary to add trailing slashes in the root router. | ||||
* | MM-10425 Include active_channel in cluster update user status messages (#8967) | Joram Wilander | 2018-06-21 | 3 | -13/+39 |
| | | | | | | | | * Include active_channel in cluster update user status messages * Update to use new ToJson method * Update tests | ||||
* | Fixing mentionBg typo in import_test.go (#8970) | Alex Goodman | 2018-06-21 | 1 | -2/+2 |
| | |||||
* | Add back the ability to reply to push notifications in iOS (#8977) | Elias Nahum | 2018-06-21 | 1 | -0/+1 |
| | |||||
* | fix typo in en.json and remove trailing spaces (#8975) | Carlos Tadeu Panato Junior | 2018-06-21 | 2 | -7/+7 |
| | |||||
* | MM-10730 Added support for empty environment variables to viper (#8973) | Harrison Healey | 2018-06-21 | 9 | -12/+1855 |
| | |||||
* | MM-10233: Add scheme importing to bulk importer. (#8928) | George Goldberg | 2018-06-21 | 45 | -127/+1224 |
| | |||||
* | translations PR 20180619 (#8963) | Elias Nahum | 2018-06-20 | 14 | -268/+164 |
| | |||||
* | Add missed translations (#8959) | Jesús Espino | 2018-06-19 | 10 | -23/+101 |
| | |||||
* | MM-6992 Added highlighting to elasticsearch results (#8861) | Harrison Healey | 2018-06-19 | 6 | -8/+65 |
| | | | | | | | | * MM-6992 Added highlighting to elasticsearch results * Added a unique type for post search matches * Fixed Elasticsearch matches not being sent through API | ||||
* | MM-8701 Limit the number of client config fields sent before user logs in ↵ | Harrison Healey | 2018-06-18 | 8 | -106/+246 |
| | | | | | | | | | | (#8954) * MM-8701 Limit the number of client config fields sent before user logs in * Fixed missing client config field * Reduced duplication between limited and regular client config | ||||
* | Small translation fixes (#8940) | Jesús Espino | 2018-06-16 | 3 | -9/+6 |
| | |||||
* | Merge remote-tracking branch 'upstream/release-5.0' into ↵ | cpanato | 2018-06-15 | 3 | -2/+19 |
|\ | | | | | | | release-5.0-merge-to-master-20180615 | ||||
| * | Add more oauth logging and note about GitLab ToS for login (#8949) | Joram Wilander | 2018-06-14 | 2 | -1/+18 |
| | | |||||
| * | MM-10767: Adding ordering to the system-admin list all teams (#8950) | Jesús Espino | 2018-06-14 | 1 | -1/+1 |
| | | |||||
* | | Update html2text lib to use the original repo (#8900) | Carlos Tadeu Panato Junior | 2018-06-14 | 35 | -948/+3659 |
| | |