summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* MM-10375 Fixing connected socket count (#8682)Corey Hulen2018-04-271-0/+1
* MM-10232, MM-10259: Improve error handling from invalid json (#8668)Jesse Hallam2018-04-261-2/+3
* add api to convert a channel from public to private and restrict that to syst...Saturnino Abril2018-04-231-28/+0
* MM-10007 Send an admin and regular WS events when a user is updated (#8588)Joram Wilander2018-04-204-1/+122
* MM-10133 Suppress confusing personal access token message in invalid session ...Joram Wilander2018-04-201-1/+7
* Fix panics caused by race in notification code (#8652)Joram Wilander2018-04-192-0/+14
* MM-10122: Adds a mention for added-to-channel messages even when 'username me...Martin Kraft2018-04-192-8/+19
* MM-9779: Incorporate a Token into the invitations system (#8604)Jesús Espino2018-04-185-33/+213
* MM-10121: CLI command to reset permissions system to default state. (#8637)George Goldberg2018-04-181-0/+25
* add app shutdown to make sure the goroutines finish and all process are close...Carlos Tadeu Panato Junior2018-04-171-3/+5
* MM-9918: Trim trailing / from push proxy URL. (#8635)George Goldberg2018-04-171-1/+1
* Merge remote-tracking branch 'origin/release-4.9' into merge49finalDerrick Anderson2018-04-172-6/+8
|\
| * Prevent disabling or modifying l4g logging filters (#8628)Jesse Hallam2018-04-131-0/+7
| * Removing user cache clear from SessionHasPermissionsTo (#8625)Christopher Speller2018-04-131-6/+1
* | Initial Commit of Ephemeral Message Support for System Admins (#8611)Daniel Schalla2018-04-171-0/+2
* | [MM-9904] Add /invite slash command to invite users to a channel (#8482)Carlos Tadeu Panato Junior2018-04-163-0/+224
* | Add Auto Responder handler (#8386)Stan Chan2018-04-124-3/+271
* | MM-8180 Improve error message for testing smtp connections (#8608)Joram Wilander2018-04-121-1/+1
* | Fix mute channel when not a member and adding unit tests (#8609)Elias Nahum2018-04-123-2/+215
* | MM-10036 Ensured correct handling of capitalized special mentions (#8607)Harrison Healey2018-04-112-3/+27
* | Merge remote-tracking branch 'origin/release-4.9' into merge-release-4.9Jesús Espino2018-04-102-8/+10
|\|
| * fix out of channel mentions for mentioned word with valid punctuations (#8585)Saturnino Abril2018-04-062-8/+10
* | MM-9849 Added tracking of which settings are set through environment variable...Harrison Healey2018-04-093-1/+14
* | MM-8678: add CUD support for channel members via plugins (#8565)Jesse Hallam2018-04-063-4/+74
|/
* MM-9934: More robust slack imports parsing (#8576)Jesús Espino2018-04-041-13/+12
* Add missing timezone setting to app/diagnostics.go (#8572)Jason Blais2018-04-041-0/+10
* revert default ephemeral post message for out of channel mention (#8571)Saturnino Abril2018-04-041-11/+2
* MM-9868 Fixed mentioning users when followed by multiple periods (#8548)Harrison Healey2018-04-022-2/+50
* Make channel mute command respond with and without ~ prefix (#8549)Elias Nahum2018-04-021-4/+10
* Fixing DB load causing user logout. (#8559)Christopher Speller2018-04-021-0/+2
* MM-9999 Fix unwanted team invite_id in email invites. (#8550)Christopher Speller2018-03-293-73/+0
* Fix sanitization on websocket user edit events. (#8551)Christopher Speller2018-03-291-5/+5
* Update zoom plugin (#8542)Joram Wilander2018-03-293-6/+6
* Fixing misspell errors (#8544)Jesús Espino2018-03-295-10/+10
* Add SAML scoping IDP settings to diagnostics.go (#8531)Jason Blais2018-03-281-0/+2
* [PLT-4340] Channel Mute and "/mute" command #7617 (#7713)Christian Claus2018-03-284-0/+128
* Merge branch 'advanced-permissions-phase-1'George Goldberg2018-03-2714-61/+624
|\
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-03-2711-65/+153
| |\
| * \ Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-2310-28/+68
| |\ \
| * \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-193-14/+59
| |\ \ \
| * \ \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1326-209/+455
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-0216-183/+754
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-194-64/+156
| |\ \ \ \ \ \
| * | | | | | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS permis...Jesús Espino2018-02-191-0/+10
| * | | | | | | MM-9618: Don't change default role permissions for policy. (#8303)George Goldberg2018-02-191-6/+6
| * | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-141-10/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-1315-77/+419
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Updates migration tests to reflect front-end mapping changes. (#8237)Martin Kraft2018-02-131-1/+1
| * | | | | | | | | Fix tests. (#8244)George Goldberg2018-02-121-6/+4
| * | | | | | | | | XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160)Martin Kraft2018-02-092-2/+5