summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Add missing timezone setting to app/diagnostics.go (#8572)Jason Blais2018-04-042-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 Speller2018-04-033-2/+16
|
* revert default ephemeral post message for out of channel mention (#8571)Saturnino Abril2018-04-042-21/+4
|
* translations PR 20180402 (#8570)Elias Nahum2018-04-0314-133/+1121
|
* MM-9868 Fixed mentioning users when followed by multiple periods (#8548)Harrison Healey2018-04-022-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 Nahum2018-04-021-4/+10
| | | | | | * Make channel mute command respond with and without ~ prefix * Re-use splitMessage
* Fixing DB load causing user logout. (#8559)Christopher Speller2018-04-022-2/+6
|
* Initialize timezone to a default state (#8560)Chris Duarte2018-03-292-1/+5
|
* MM-9999 Fix unwanted team invite_id in email invites. (#8550)Christopher Speller2018-03-295-78/+0
| | | | | | * Fix unwanted team invite_id in email invites. * Removing unused translation.
* Fix sanitization on websocket user edit events. (#8551)Christopher Speller2018-03-291-5/+5
|
* Update zoom plugin (#8542)Joram Wilander2018-03-293-6/+6
|
* fix user timezone initialization (#8547)Jesse Hallam2018-03-292-1/+4
| | | On PreSave, need to ensure TimeZone isn't left as NULL.
* Fixing misspell errors (#8544)Jesús Espino2018-03-2928-44/+44
|
* Add ExperimentalTimezone flag (#8539)Chris Duarte2018-03-293-0/+16
|
* MM-9661: tweak post message size log (#8517)Jesse Hallam2018-03-292-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 Speller2018-03-282-7/+9
| | | This reverts commit f0f4f68defef1e9360394ba740c57cff7124dc9c.
* Remove the index on Channels.DisplayName. (#8530)Jesse Hallam2018-03-283-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 Hallam2018-03-281-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 Wilander2018-03-281-0/+8
|
* Add SAML scoping IDP settings to diagnostics.go (#8531)Jason Blais2018-03-281-0/+2
|
* Fix roles table ID max length so MySQL 5.6 doesn't fail. (#8532)George Goldberg2018-03-281-0/+1
|
* translations PR 20180326 (#8514)Elias Nahum2018-03-2814-78/+494
|
* [PLT-4340] Channel Mute and "/mute" command #7617 (#7713)Christian Claus2018-03-287-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 Goldberg2018-03-2775-1502/+4360
|\
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-03-2742-193/+1028
| |\
| * | Fix typo in MANAGE_SYSTEM_WIDE_OAUTH permission. (#8516)George Goldberg2018-03-271-3/+3
| | |
| * | Ignore blank role names in getRolesByName call. (#8507)George Goldberg2018-03-262-3/+19
| | |
| * | Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-2353-163/+2848
| |\ \
| * \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1925-341/+570
| |\ \ \
| * \ \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-13167-3042/+5007
| |\ \ \ \
| * | | | | MM-8830 Consistent Incomming/Outgoing webhooks permissions (#8335)Jesús Espino2018-03-071-8/+20
| | | | | |
| * | | | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-0274-1158/+2709
| |\ \ \ \ \
| * | | | | | MM-8825: Make consistent INVITE_USER and ADD_USER_TO_TEAM permissions ↵Jesús Espino2018-02-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | checking (#8326)
| * | | | | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-19617-129270/+23454
| |\ \ \ \ \ \
| * | | | | | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS ↵Jesús Espino2018-02-196-188/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions (#8300)
| * | | | | | | MM-9618: Don't change default role permissions for policy. (#8303)George Goldberg2018-02-195-47/+47
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-146-32/+45
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-130-0/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)Joram Wilander2018-02-134-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 Goldberg2018-02-131-0/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-1374-666/+939
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updates migration tests to reflect front-end mapping changes. (#8237)Martin Kraft2018-02-136-31/+65
| | | | | | | | | | |
| * | | | | | | | | | XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245)Martin Kraft2018-02-122-6/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix tests. (#8244)George Goldberg2018-02-123-18/+8
| | | | | | | | | | |
| * | | | | | | | | | XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160)Martin Kraft2018-02-095-29/+667
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * XYZ-10: Role store. * XYZ-37: Update unit tests to work with database roles. * XYZ-51: Tests 'SetRolePermissionsFromConfig' against JSON from policy page. * XYZ-51: Adds permissions in non-licensed cases also. * XYZ-51: Removes some permissions from team_user role. * XYZ-51: Merge fix for change to default permissions from PR 8208. * XYZ-51: Removes unused function.
| * | | | | | | | | | AllowEditPost and PostEditTimeLimit migration (#8208)Jesús Espino2018-02-0910-26/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * AllowEditPost and PostEditTimeLimit migration * Not set EDIT_POST permission to sysadmin_role if ALLOW_EDIT_POST is configured to NEVER * Remove a bit of code duplication
| * | | | | | | | | | XYZ-80: Add CreateAt/UpdateAt/DeleteAt fields to roles table. (#8223)George Goldberg2018-02-082-0/+15
| | | | | | | | | | |
| * | | | | | | | | | XYZ-76: Add license check to patchRoles endpoint. (#8224)George Goldberg2018-02-084-3/+99
| | | | | | | | | | |
| * | | | | | | | | | XYZ-59: Implement redis caching layer for Role store. (#8207)George Goldberg2018-02-074-67/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * XYZ-59: Implement redis caching layer for Role store. * Use variable for key where used more than once.
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Jesús Espino2018-02-0752-125/+699
| |\ \ \ \ \ \ \ \ \ \