Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | using inbucket docker image tag release-1.2.0 instead of latest (#8406) | Carlos Tadeu Panato Junior | 2018-03-12 | 2 | -2/+2 |
| | |||||
* | MM-8839: Adds ChannelType to compliance-related model. (#8424) | Martin Kraft | 2018-03-09 | 4 | -0/+9 |
| | |||||
* | Remove query to update channel extra_update_at field on user ↵ | Joram Wilander | 2018-03-09 | 6 | -93/+10 |
| | | | | activation/deactivation (#8415) | ||||
* | MM-9274- Sort Users in Channel by status (#8181) | Stephen Kiers | 2018-03-09 | 14 | -29/+538 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sort by lastActivity * added status ordering to Users * sort offline before dnd * remove data not needed * added seperate call for when order=‘status’ is on GetUser request * remove PrintLn * styling fix * remove mistake * mistake 2 * better comment * explicit if statemnt * writing tests * removed manually added mocks * generated mock * ICU-668 Added unit tests * style fix * sort by lastActivity * added status ordering to Users * sort offline before dnd * remove data not needed * added seperate call for when order=‘status’ is on GetUser request * remove PrintLn * styling fix * remove mistake * mistake 2 * better comment * explicit if statemnt * writing tests * removed manually added mocks * generated mock * ICU-668 Added unit tests * style fix * reverse dnd and offline * Fixed app.SaveStatusAndBroadcast * Fixed incorrect merge * Fixing incorrect merge again | ||||
* | Merge branch 'merge-4.8' | Derrick Anderson | 2018-03-08 | 17 | -42/+398 |
|\ | |||||
| * | Merge branch 'release-4.8' into merge-4.8 | JoramWilander | 2018-03-08 | 17 | -42/+398 |
|/| | |||||
| * | respect plugin manifest webapp bundle_path (#8393) | Chris | 2018-03-07 | 2 | -4/+22 |
| | | |||||
| * | plugin sandbox fixes (#8418) | Chris | 2018-03-07 | 1 | -1/+10 |
| | | |||||
| * | translations PR 20180306 (#8414) | Elias Nahum | 2018-03-07 | 14 | -37/+349 |
| | | |||||
| * | register additional gob types to support arrays and dicts in post props (#8412) | Chris | 2018-03-06 | 2 | -5/+40 |
| | | |||||
| * | Uncomment upgrade code to 4.8 (#8409) | Derrick Anderson | 2018-03-05 | 2 | -4/+4 |
| | | | | | | | | | | | | * upgrade to 48 * fix upgrade bug | ||||
* | | Moved team icon upgrade code to 4.9 since it didn't make it in for 4.8 (#8410) | Joram Wilander | 2018-03-08 | 1 | -1/+1 |
| | | |||||
* | | MM-8840: Add GlobalRelay Configuration Settings (#8304) | Jonathan | 2018-03-08 | 3 | -14/+177 |
| | | | | | | | | | | | | | | | | * Added new GlobalRelay config settings * Adding default values to global relay config * Migrate global relay config tests to table driven tests | ||||
* | | Adding enterprise commands support (#8327) | Jesús Espino | 2018-03-07 | 39 | -559/+677 |
| | | |||||
* | | respect plugin manifest webapp bundle_path (#8393) | Chris | 2018-03-07 | 2 | -4/+22 |
| | | |||||
* | | general cleanup (#8387) | Chris | 2018-03-07 | 35 | -665/+30 |
| | | |||||
* | | Readding uasurfer library (#8420) | Jesús Espino | 2018-03-07 | 12 | -2/+2371 |
| | | |||||
* | | XYZ-87: GlobalRelay DM Exports do not Include Channel Name (#8275) | Jonathan | 2018-03-07 | 4 | -30/+362 |
| | | | | | | | | | | | | | | | | | | | | * Adding ChannelMemberHistory table records when DM channels are created. This ensures that both participants in a DM are shown in compliance export, even if only one of them typed anything * Direct/Group Message channels now get pretty display names for the purpose of compliance exports * Fixed string formatting in t.Fatal calls * Changed uses of ChannelMemberHistory over to ChannelMemberHistoryResult in tests. This should have been done as a part of the work in XYZ-110, but seems to have been missed in this branch for some reason | ||||
* | | Add addedUser IDs to render correctly in client based on teammate name ↵ | Philippe GRANET | 2018-03-07 | 1 | -0/+5 |
| | | | | | | | | | | | | display setting (#8400) See PLT-7776 on mattermost-webapp: https://github.com/mattermost/mattermost-webapp/pull/353 | ||||
* | | [PLT-7574] Update and Simplify Compatibility Check and Replace UA Dependency ↵ | Alex Moon | 2018-03-06 | 2 | -12/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#7427) * Add fix to not run browser check on Mobile Browsers or the App * remove non safari and IE checks * Replace useragent checking dependency and update UA tests * change some wording * change dependancy again to one with compatible licence * Fix typos and clarify wording * fix typo and comvert tests to use array | ||||
* | | Add preparatory upgrade code for 4.9 (#8408) | Joram Wilander | 2018-03-05 | 2 | -4/+12 |
| | | |||||
* | | MM-9664 Add invalidation metrics for store caches (#8340) | Joram Wilander | 2018-03-05 | 16 | -36/+130 |
| | | | | | | | | | | | | | | | | * Add invalidation metrics for store caches * Increment session invalidation metric * Fix tests | ||||
* | | MM-8604: emit config/license websocket events (#8371) | Jesse Hallam | 2018-03-05 | 5 | -10/+45 |
| | | |||||
* | | fix Mozilla typo (#8395) | Carlos Tadeu Panato Junior | 2018-03-05 | 1 | -1/+1 |
| | | |||||
* | | remove `go Publish(...)` idiom (#8373) | Chris | 2018-03-02 | 12 | -70/+23 |
| | | |||||
* | | PLT-7567: Integration of Team Icons (#8284) | Christian Hoff | 2018-03-01 | 11 | -13/+421 |
| | | | | | | | | | | | | | | | | | | | | * PLT-7567: Integration of Team Icons * PLT-7567: Read replica workaround, upgrade logic moved, more concrete i18n key * PLT-7567: Read replica workaround, corrections * PLT-7567: upgrade correction | ||||
* | | fix linux cap header structure (#8389) | Chris | 2018-03-01 | 1 | -1/+1 |
| | | |||||
* | | [PLT-8024] Support LOGIN authentication method for SMTP (#8140) | Carlos Tadeu Panato Junior | 2018-03-01 | 2 | -5/+117 |
| | | | | | | | | | | | | * [PLT-8024] Support LOGIN authentication method for SMTP * added initial unit tests | ||||
* | | [PLT-8186] add support for ec2 instance profile authentication (#8243) | Carlos Tadeu Panato Junior | 2018-02-28 | 6 | -1/+173 |
| | | |||||
* | | Simplification of a Channel Members query. (#8345) | George Goldberg | 2018-02-28 | 1 | -3/+3 |
| | | |||||
* | | optimize lru purging (#8381) | Chris | 2018-02-28 | 2 | -103/+43 |
| | | |||||
* | | Fix prerequisites checker so 1.10 > 1.9 (#8344) | Fede | 2018-02-27 | 1 | -2/+2 |
|/ | | | | | | * Fix prerequisites checker so 1.10 > 1.9 * Check prerequisites sorting by dot separator | ||||
* | Temporarily disable flaky TestSendMailUsingConfigAdvanced test (#8379) | Joram Wilander | 2018-02-27 | 1 | -8/+2 |
| | | | | | | * Temporarily disable flaky TestSendMailUsingConfigAdvanced test * Remove imports | ||||
* | MM-9698 Fixing Minio with server side encryption. (#8367) | Christopher Speller | 2018-02-26 | 2 | -7/+39 |
| | | | | | | * Fixig Minio with server side encryption. * Add png file backend test | ||||
* | add individual platform packaging targets (#8366) | Chris | 2018-02-26 | 2 | -9/+7 |
| | |||||
* | Fix forward 80 to 443 to not bind on all interfaces. (#8360) | Christopher Speller | 2018-02-23 | 1 | -12/+17 |
| | |||||
* | Merge branch 'merge47intomaster' | Derrick Anderson | 2018-02-23 | 1 | -2/+4 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/release-4.7' into merge47intomaster | Derrick Anderson | 2018-02-23 | 1 | -2/+4 |
|/| | |||||
| * | Change log level of 404s to DEBUG (#8339) | Joram Wilander | 2018-02-21 | 1 | -2/+4 |
| | | |||||
* | | fix scheduled task race (#8355) | Chris | 2018-02-23 | 3 | -208/+70 |
| | | |||||
* | | MM-8593 Default APIv3 to disabled for new installs (#8353) | Joram Wilander | 2018-02-23 | 4 | -1/+4 |
| | | | | | | | | | | | | | | | | * Default APIv3 to disabled for new installs * Add EnableAPIv3 setting to client config * Enable APIv3 for needed tests | ||||
* | | Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352) | Joram Wilander | 2018-02-23 | 1 | -1/+6 |
| | | |||||
* | | Remove global site url (#8343) | Chris | 2018-02-22 | 12 | -35/+32 |
| | | | | | | | | | | | | | | | | * remove global site url * missed one * revert mysterious change | ||||
* | | Fix push notification content for file only messages (#8346) | Joram Wilander | 2018-02-22 | 3 | -2/+16 |
| | | |||||
* | | Adding saml migration command (#8263) | Jesús Espino | 2018-02-21 | 3 | -28/+176 |
| | | | | | | | | | | | | * Adding saml migration command * Texts fixed | ||||
* | | MM-8681 Adding config settings necessary for using CloudFront. (#8307) | Christopher Speller | 2018-02-20 | 8 | -0/+43 |
| | | | | | | | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics. | ||||
* | | Update en.json (#8332) | Jason Blais | 2018-02-20 | 1 | -1/+1 |
| | | |||||
* | | MM-8710: Web Hub optimizations (#8293) | Chris | 2018-02-20 | 3 | -50/+156 |
| | | | | | | | | | | | | | | | | | | | | | | | | * webhub optimizations * test fix * minor fix * big perf improvement to ToJson after precomputing * fix hub connection count | ||||
* | | MM-9556 Added ability to upload files without a multipart request (#8306) | Harrison Healey | 2018-02-20 | 8 | -36/+242 |
| | | | | | | | | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour | ||||
* | | Added t.Helper to CheckXStatus test functions (#8305) | Harrison Healey | 2018-02-20 | 1 | -21/+28 |
| | |