Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Better error handling for failed plugin activation (#8361) | Joram Wilander | 2018-03-13 | 2 | -9/+46 |
| | |||||
* | Merge remote-tracking branch 'origin/release-4.8' into t3mergetomaster | Derrick Anderson | 2018-03-12 | 1 | -1/+1 |
|\ | |||||
| * | ICU-682 Stopped sending out of channel mention warnings for system messages ↵ | Harrison Healey | 2018-03-09 | 1 | -1/+1 |
| | | | | | | | | (#8426) | ||||
* | | Adding new global relay settings to diagnostics and default.json (#8441) | Jesús Espino | 2018-03-12 | 1 | -5/+9 |
| | | |||||
* | | Removed mssola/user_agent library (#8417) | Harrison Healey | 2018-03-12 | 1 | -8/+6 |
| | | | | | | | | | | | | * Removed mssola/user_agent library * Changed user agent tests to use t.Run | ||||
* | | [MM-9725] Slack compatibility code in webhooks captures incorrect text (#8428) | Carlos Tadeu Panato Junior | 2018-03-12 | 2 | -1/+59 |
| | | |||||
* | | Remove query to update channel extra_update_at field on user ↵ | Joram Wilander | 2018-03-09 | 1 | -4/+0 |
| | | | | | | | | activation/deactivation (#8415) | ||||
* | | MM-9274- Sort Users in Channel by status (#8181) | Stephen Kiers | 2018-03-09 | 6 | -23/+213 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | general cleanup (#8387) | Chris | 2018-03-07 | 8 | -105/+16 |
| | | |||||
* | | XYZ-87: GlobalRelay DM Exports do not Include Channel Name (#8275) | Jonathan | 2018-03-07 | 2 | -8/+80 |
| | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | MM-9664 Add invalidation metrics for store caches (#8340) | Joram Wilander | 2018-03-05 | 2 | -5/+8 |
| | | | | | | | | | | | | | | | | * 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 | 3 | -1/+42 |
| | | |||||
* | | remove `go Publish(...)` idiom (#8373) | Chris | 2018-03-02 | 8 | -63/+19 |
| | | |||||
* | | PLT-7567: Integration of Team Icons (#8284) | Christian Hoff | 2018-03-01 | 1 | -0/+90 |
|/ | | | | | | | | | | * 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 forward 80 to 443 to not bind on all interfaces. (#8360) | Christopher Speller | 2018-02-23 | 1 | -12/+17 |
| | |||||
* | fix scheduled task race (#8355) | Chris | 2018-02-23 | 1 | -5/+13 |
| | |||||
* | 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 | 8 | -20/+27 |
| | | | | | | | | * remove global site url * missed one * revert mysterious change | ||||
* | Fix push notification content for file only messages (#8346) | Joram Wilander | 2018-02-22 | 2 | -2/+12 |
| | |||||
* | MM-8681 Adding config settings necessary for using CloudFront. (#8307) | Christopher Speller | 2018-02-20 | 3 | -0/+15 |
| | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics. | ||||
* | MM-8710: Web Hub optimizations (#8293) | Chris | 2018-02-20 | 1 | -50/+83 |
| | | | | | | | | | | | | * 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 | 1 | -9/+30 |
| | | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour | ||||
* | Remove unnecesary line | Jesús Espino | 2018-02-19 | 1 | -1/+0 |
| | |||||
* | merge 4.7.1 to master | Saturnino Abril | 2018-02-19 | 4 | -87/+465 |
|\ | |||||
| * | Merge branch 'release-4.7' into icu753 | Derrick Anderson | 2018-02-14 | 5 | -58/+189 |
| |\ | |||||
| | * | Merge branch 'XYZ-110' into release-4.7 | Derrick Anderson | 2018-02-14 | 1 | -10/+10 |
| | |\ | |||||
| | | * | Merge branch 'release-4.7' into XYZ-110 | Jonathan Fritz | 2018-02-13 | 20 | -487/+81 |
| | | |\ | |||||
| | | * | | Removed unused fields from ChannelMemberHistory table, introduced new ↵ | Jonathan Fritz | 2018-02-12 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables | ||||
| | * | | | Merge branch 'ICU-764' into release-4.7 | Derrick Anderson | 2018-02-14 | 2 | -45/+81 |
| | |\ \ \ | |||||
| | | * | | | gofmt | Stephen Kiers | 2018-02-13 | 1 | -2/+0 |
| | | | | | | |||||
| | | * | | | rerun jenkins? | Stephen Kiers | 2018-02-13 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | remove debug statement | Stephen Kiers | 2018-02-13 | 1 | -2/+0 |
| | | | | | | |||||
| | | * | | | Added more tests and simplified code | Stephen Kiers | 2018-02-13 | 2 | -48/+57 |
| | | | | | | |||||
| | | * | | | Added another test | Stephen Kiers | 2018-02-12 | 1 | -0/+9 |
| | | | | | | |||||
| | | * | | | Fixes ICU-764 | Stephen Kiers | 2018-02-12 | 2 | -0/+21 |
| | | | | | | |||||
| | * | | | | Merge branch 'XYZ-111' of https://github.com/jespino/platform into ↵ | Derrick Anderson | 2018-02-14 | 2 | -3/+98 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | jespino-XYZ-111 | ||||
| | | * | | | XYZ-111: Check max users per team on re-join after leave a team | Jesús Espino | 2018-02-13 | 2 | -3/+98 |
| | | |/ / | |||||
| * | | | | ICU-753 Added unit tests for messages with only push notifications | Harrison Healey | 2018-02-13 | 2 | -1/+25 |
| | | | | | |||||
| * | | | | ICU-753 Added unit tests for push notification contents | Harrison Healey | 2018-02-13 | 2 | -39/+262 |
| | | | | | |||||
| * | | | | ICU-753 Remove special behaviour for group messages in generic push ↵ | Harrison Healey | 2018-02-13 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | notifications | ||||
* | | | | always return non-nil client license (#8317) | Chris | 2018-02-16 | 1 | -3/+5 |
| | | | | |||||
* | | | | XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274) | Jesús Espino | 2018-02-15 | 1 | -0/+6 |
| | | | | |||||
* | | | | gofmt | Derrick Anderson | 2018-02-13 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge release-4.7 with master in side branch | Derrick Anderson | 2018-02-13 | 3 | -63/+147 |
|\| | | | |||||
| * | | | Merge branch 'release-4.7' into rm-willnorris-proxy-support | Chris | 2018-02-12 | 20 | -427/+213 |
| |\| | | |||||
| | * | | revert master changes | Derrick Anderson | 2018-02-12 | 18 | -423/+71 |
| | |/ | |||||
| | * | Merge branch 'release-4.7' into icu669 | Derrick Anderson | 2018-02-12 | 22 | -76/+517 |
| | |\ | |||||
| | * | | Fixed typo in unit test | Harrison Healey | 2018-02-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | ICU-669 Handle relative links better | Harrison Healey | 2018-02-09 | 2 | -12/+19 |
| | | | |