summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [MM-9703] Push notifications are sent for own DM's (#8439)Carlos Tadeu Panato Junior2018-03-151-4/+9
| | | update
* Merge branch 't2releasetomaster'Derrick Anderson2018-03-131-0/+3
|\
| * Merge remote-tracking branch 'origin/release-4.8' into t2releasetomasterDerrick Anderson2018-03-131-0/+3
|/|
| * MM-9795: Fix theme chooser for non-EE builds (#8440)Michał Odziemczyk2018-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | * Fix theme chooser for non-EE builds * fix compilation * remove whitespace * fix
* | remove s3 region to be mandatory and fix when user call test s3 when the ↵Carlos Tadeu Panato Junior2018-03-144-23/+15
| | | | | | | | config is saved (#8454)
* | MM-9688: Better error message for plugin enabling in HA mode (#8433)Chris2018-03-132-0/+7
| | | | | | | | | | | | * better error message for plugin enabling in HA mode * wording update
* | update email test in the driver to be able to send the config in the body ↵Carlos Tadeu Panato Junior2018-03-132-19/+25
| | | | | | | | | | (#8453) Signed-off-by: cpanato <ctadeu@gmail.com>
* | Delete mkdocs.yml (#8447)Florian Vogt2018-03-131-11/+0
| | | | | | The file is from the old documentation and is therefore no longer needed.
* | Better error handling for failed plugin activation (#8361)Joram Wilander2018-03-132-9/+46
| |
* | Merge remote-tracking branch 'origin/t3mergetomaster'Derrick Anderson2018-03-133-24/+31
|\ \
| * | Merge remote-tracking branch 'origin/release-4.8' into t3mergetomasterDerrick Anderson2018-03-123-24/+31
|/| | | |/
| * Fix saml users.json parameter (#8435)Jesús Espino2018-03-121-2/+2
| |
| * ICU-682 Stopped sending out of channel mention warnings for system messages ↵Harrison Healey2018-03-091-1/+1
| | | | | | | | (#8426)
| * fix sandbox cleanup (#8421)Chris2018-03-081-21/+28
| |
* | Adding new global relay settings to diagnostics and default.json (#8441)Jesús Espino2018-03-122-6/+16
| |
* | Removed mssola/user_agent library (#8417)Harrison Healey2018-03-1213-1497/+17
| | | | | | | | | | | | * Removed mssola/user_agent library * Changed user agent tests to use t.Run
* | [MM-9720] Platform command to change user email address (#8422)Carlos Tadeu Panato Junior2018-03-122-0/+68
| |
* | [MM-9725] Slack compatibility code in webhooks captures incorrect text (#8428)Carlos Tadeu Panato Junior2018-03-122-1/+59
| |
* | using inbucket docker image tag release-1.2.0 instead of latest (#8406)Carlos Tadeu Panato Junior2018-03-122-2/+2
| |
* | MM-8839: Adds ChannelType to compliance-related model. (#8424)Martin Kraft2018-03-094-0/+9
| |
* | Remove query to update channel extra_update_at field on user ↵Joram Wilander2018-03-096-93/+10
| | | | | | | | activation/deactivation (#8415)
* | MM-9274- Sort Users in Channel by status (#8181)Stephen Kiers2018-03-0914-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 Anderson2018-03-0817-42/+398
|\ \
| * | Merge branch 'release-4.8' into merge-4.8JoramWilander2018-03-0817-42/+398
|/| | | |/
| * respect plugin manifest webapp bundle_path (#8393)Chris2018-03-072-4/+22
| |
| * plugin sandbox fixes (#8418)Chris2018-03-071-1/+10
| |
| * translations PR 20180306 (#8414)Elias Nahum2018-03-0714-37/+349
| |
| * register additional gob types to support arrays and dicts in post props (#8412)Chris2018-03-062-5/+40
| |
| * Uncomment upgrade code to 4.8 (#8409)Derrick Anderson2018-03-052-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 Wilander2018-03-081-1/+1
| |
* | MM-8840: Add GlobalRelay Configuration Settings (#8304)Jonathan2018-03-083-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 Espino2018-03-0739-559/+677
| |
* | respect plugin manifest webapp bundle_path (#8393)Chris2018-03-072-4/+22
| |
* | general cleanup (#8387)Chris2018-03-0735-665/+30
| |
* | Readding uasurfer library (#8420)Jesús Espino2018-03-0712-2/+2371
| |
* | XYZ-87: GlobalRelay DM Exports do not Include Channel Name (#8275)Jonathan2018-03-074-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 GRANET2018-03-071-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 Moon2018-03-062-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 Wilander2018-03-052-4/+12
| |
* | MM-9664 Add invalidation metrics for store caches (#8340)Joram Wilander2018-03-0516-36/+130
| | | | | | | | | | | | | | | | * Add invalidation metrics for store caches * Increment session invalidation metric * Fix tests
* | MM-8604: emit config/license websocket events (#8371)Jesse Hallam2018-03-055-10/+45
| |
* | fix Mozilla typo (#8395)Carlos Tadeu Panato Junior2018-03-051-1/+1
| |
* | remove `go Publish(...)` idiom (#8373)Chris2018-03-0212-70/+23
| |
* | PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-0111-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)Chris2018-03-011-1/+1
| |
* | [PLT-8024] Support LOGIN authentication method for SMTP (#8140)Carlos Tadeu Panato Junior2018-03-012-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 Junior2018-02-286-1/+173
| |
* | Simplification of a Channel Members query. (#8345)George Goldberg2018-02-281-3/+3
| |
* | optimize lru purging (#8381)Chris2018-02-282-103/+43
| |
* | Fix prerequisites checker so 1.10 > 1.9 (#8344)Fede2018-02-271-2/+2
|/ | | | | | * Fix prerequisites checker so 1.10 > 1.9 * Check prerequisites sorting by dot separator