Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | MM-8400 Provide default config values to viper so that it reads all ↵ | Harrison Healey | 2018-04-06 | 2 | -41/+150 | |
| | | | | | | | | | | | | | | | | environment variables (#8581) * MM-8400 Provide default config values to viper so that it reads all environment variables * Added unit tests | |||||
* | | uncomment 4.9 upgrade code (#8582) | Derrick Anderson | 2018-04-05 | 2 | -10/+20 | |
|/ | | | | | | | | * set db to 4.9 * add prepatory code for 4.10 * bug from old example | |||||
* | Remove problematic mute test (#8580) | Joram Wilander | 2018-04-05 | 1 | -114/+0 | |
| | ||||||
* | Comment out problematic mail test (#8579) | Joram Wilander | 2018-04-04 | 1 | -6/+2 | |
| | ||||||
* | Minor text changes to /open, /join and /mute slash commands (#8569) | Jason Blais | 2018-04-04 | 1 | -3/+3 | |
| | | | | | | | | | | | | * Update en.json * Update en.json * Update en.json * Fix bad rebasing * ping jenkins | |||||
* | MM-9934: More robust slack imports parsing (#8576) | Jesús Espino | 2018-04-04 | 1 | -13/+12 | |
| | ||||||
* | Migrate Advanced Permissions Roles when needed on cli commands (#8535) | Jesús Espino | 2018-04-04 | 1 | -0/+2 | |
| | ||||||
* | Add missing timezone setting to app/diagnostics.go (#8572) | Jason Blais | 2018-04-04 | 2 | -1/+13 | |
| | | | | | | | | * Add missing timezone setting to app/diagnostics.go * Update diagnostics.go * Added TimezoneSettings.SupportedTimezonesPath to diagnostics | |||||
* | Fixing unit tests for Go 1.10 (#8568) | Christopher Speller | 2018-04-03 | 3 | -2/+16 | |
| | ||||||
* | revert default ephemeral post message for out of channel mention (#8571) | Saturnino Abril | 2018-04-04 | 2 | -21/+4 | |
| | ||||||
* | translations PR 20180402 (#8570) | Elias Nahum | 2018-04-03 | 14 | -133/+1121 | |
| | ||||||
* | MM-9868 Fixed mentioning users when followed by multiple periods (#8548) | Harrison Healey | 2018-04-02 | 2 | -2/+50 | |
| | | | | | | | | * MM-9868 Fixed mentioning users when followed by multiple periods * Added additional unit test * Added comment to clarify test purpose | |||||
* | Make channel mute command respond with and without ~ prefix (#8549) | Elias Nahum | 2018-04-02 | 1 | -4/+10 | |
| | | | | | | * Make channel mute command respond with and without ~ prefix * Re-use splitMessage | |||||
* | Fixing DB load causing user logout. (#8559) | Christopher Speller | 2018-04-02 | 2 | -2/+6 | |
| | ||||||
* | Initialize timezone to a default state (#8560) | Chris Duarte | 2018-03-29 | 2 | -1/+5 | |
| | ||||||
* | MM-9999 Fix unwanted team invite_id in email invites. (#8550) | Christopher Speller | 2018-03-29 | 5 | -78/+0 | |
| | | | | | | * Fix unwanted team invite_id in email invites. * Removing unused translation. | |||||
* | Fix sanitization on websocket user edit events. (#8551) | Christopher Speller | 2018-03-29 | 1 | -5/+5 | |
| | ||||||
* | Update zoom plugin (#8542) | Joram Wilander | 2018-03-29 | 3 | -6/+6 | |
| | ||||||
* | fix user timezone initialization (#8547) | Jesse Hallam | 2018-03-29 | 2 | -1/+4 | |
| | | | On PreSave, need to ensure TimeZone isn't left as NULL. | |||||
* | Fixing misspell errors (#8544) | Jesús Espino | 2018-03-29 | 28 | -44/+44 | |
| | ||||||
* | Add ExperimentalTimezone flag (#8539) | Chris Duarte | 2018-03-29 | 3 | -0/+16 | |
| | ||||||
* | MM-9661: tweak post message size log (#8517) | Jesse Hallam | 2018-03-29 | 2 | -3/+3 | |
| | | | | Call out the number of supported characters explicitly, moving the byte limit to parentheses. | |||||
* | Revert "add individual platform packaging targets (#8366)" (#8537) | Christopher Speller | 2018-03-28 | 2 | -7/+9 | |
| | | | This reverts commit f0f4f68defef1e9360394ba740c57cff7124dc9c. | |||||
* | Remove the index on Channels.DisplayName. (#8530) | Jesse Hallam | 2018-03-28 | 3 | -5/+25 | |
| | | | | | | | As outlined in [this discussion](https://pre-release.mattermost.com/core/pl/uw5bwmkb6irkbkn6pk9rkzpytr), this index causes issues with MySQL's query planner, leading to full table scans in a case where it would have made more sense to leverage a filesort. | |||||
* | Add unit test coverage for SqlStatusStore.GetAllFromTeam (#8520) | Jesse Hallam | 2018-03-28 | 1 | -0/+90 | |
| | | | | I added this as part of a separate PR that was deferred for now, but figured the unit test coverage would still be useful. | |||||
* | Add defaults for SAML settings (#8536) | Joram Wilander | 2018-03-28 | 1 | -0/+8 | |
| | ||||||
* | Add SAML scoping IDP settings to diagnostics.go (#8531) | Jason Blais | 2018-03-28 | 1 | -0/+2 | |
| | ||||||
* | Fix roles table ID max length so MySQL 5.6 doesn't fail. (#8532) | George Goldberg | 2018-03-28 | 1 | -0/+1 | |
| | ||||||
* | translations PR 20180326 (#8514) | Elias Nahum | 2018-03-28 | 14 | -78/+494 | |
| | ||||||
* | [PLT-4340] Channel Mute and "/mute" command #7617 (#7713) | Christian Claus | 2018-03-28 | 7 | -37/+316 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add command and store changes to allow mute toggling * Change channel muting to use ChannelMember notification structure * Suppress email and push notifications for a muted channel * Make i18n keys issue-compliant * Add notification-cache handling for channel-muting * Add channel handle for channel-muting slash-command * Add unit test for mute command * Merge branch 'master' into PLT-4340 # Conflicts: # app/notification.go * Fix issue that command_mute responses will be overwritten * Fix i18n key for channel muting * Apply new Provider Interface to MuteCommand * Migrate mute notification property to mark_unread PLT-4340 * Make some i18n improvements for command_mute PLT-4340 * Remove de.json translations * Prevent push notifications when channel is muted * Treat Group messages like Direct messages * Fix unit test * Send WS event when the channel member notify props changed | |||||
* | Merge branch 'advanced-permissions-phase-1' | George Goldberg | 2018-03-27 | 75 | -1502/+4360 | |
|\ | ||||||
| * | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 | Martin Kraft | 2018-03-27 | 42 | -193/+1028 | |
| |\ | ||||||
| * | | Fix typo in MANAGE_SYSTEM_WIDE_OAUTH permission. (#8516) | George Goldberg | 2018-03-27 | 1 | -3/+3 | |
| | | | ||||||
| * | | Ignore blank role names in getRolesByName call. (#8507) | George Goldberg | 2018-03-26 | 2 | -3/+19 | |
| | | | ||||||
| * | | Merge branch 'master' into advanced-permissions-phase-1 | Martin Kraft | 2018-03-23 | 53 | -163/+2848 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-03-19 | 25 | -341/+570 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-03-13 | 167 | -3042/+5007 | |
| |\ \ \ \ | ||||||
| * | | | | | MM-8830 Consistent Incomming/Outgoing webhooks permissions (#8335) | Jesús Espino | 2018-03-07 | 1 | -8/+20 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-03-02 | 74 | -1158/+2709 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | MM-8825: Make consistent INVITE_USER and ADD_USER_TO_TEAM permissions ↵ | Jesús Espino | 2018-02-20 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking (#8326) | |||||
| * | | | | | | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-02-19 | 617 | -129270/+23454 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS ↵ | Jesús Espino | 2018-02-19 | 6 | -188/+333 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions (#8300) | |||||
| * | | | | | | | MM-9618: Don't change default role permissions for policy. (#8303) | George Goldberg | 2018-02-19 | 5 | -47/+47 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 | Martin Kraft | 2018-02-14 | 6 | -32/+45 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 | Martin Kraft | 2018-02-13 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) | Joram Wilander | 2018-02-13 | 4 | -2/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent changing PluginSettings.EnableUploads through the API * Contain api4 test case in it's own test | |||||
| * | | | | | | | | | XYZ-78: Add note to upgrade code about advanced permissions migration. (#8267) | George Goldberg | 2018-02-13 | 1 | -0/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-02-13 | 74 | -666/+939 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Updates migration tests to reflect front-end mapping changes. (#8237) | Martin Kraft | 2018-02-13 | 6 | -31/+65 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245) | Martin Kraft | 2018-02-12 | 2 | -6/+0 | |
| | | | | | | | | | | |