summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-116-71/+63
|\
| * MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)Jesse Hallam2018-05-104-12/+14
| * MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-103-59/+49
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-101-1/+1
|\|
| * Fixes incorrect MiB size. (#8750)Martin Kraft2018-05-091-1/+1
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-098-41/+124
|\|
| * Added missing i18n strings for files and email batching (#8700)Harrison Healey2018-05-042-17/+44
| * respect image orientation before saving height and width of FileInfo (#8710)Saturnino Abril2018-05-041-0/+8
| * MM-10393: Fix for tracking active vs inactive users. (#8706)Martin Kraft2018-05-031-12/+12
| * Fix TestSendNotifications test (#8712)Jesús Espino2018-05-031-1/+1
| * MM-10424: Migrate PostEditTimeLimit config setting. (#8702)George Goldberg2018-05-022-0/+36
| * Add inactive user count to analytics and fix client analytics function (#8695)Joram Wilander2018-05-021-2/+16
| * [MM-10415] Reorder checks for command invite (#8701)Carlos Tadeu Panato Junior2018-05-021-9/+7
* | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-031-0/+101
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-024-43/+42
|\|
| * Update zoom plugin to 0.1.6 (#8698)Joram Wilander2018-05-013-6/+6
| * MM-8622: improved plugin error handling (#8692)Jesse Hallam2018-05-011-37/+36
* | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-024-0/+71
* | Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermo...Martin Kraft2018-05-011-2/+2
|\ \
| * \ Merge branch 'master' into advanced-permissions-phase-2Christopher Speller2018-04-2746-389/+422
| |\ \
* | \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0147-392/+486
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | MM-9072/MM-10185 Force-convert the encoding of OpenGraph metadata to UTF-8 (#...Hyeseong Kim2018-04-302-1/+43
| * | Add missing diagnostics for 4.10 (#8675)Jason Blais2018-04-301-0/+1
| * | [MM-10354] Add feature to remove team icon (#8684)Saturnino Abril2018-04-301-1/+19
| |/
| * Structured logging (#8673)Christopher Speller2018-04-2746-389/+421
| * MM-10375 Fixing connected socket count (#8682)Corey Hulen2018-04-271-0/+1
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-2/+3
|\|
| * MM-10232, MM-10259: Improve error handling from invalid json (#8668)Jesse Hallam2018-04-261-2/+3
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-241-28/+0
|\|
| * add api to convert a channel from public to private and restrict that to syst...Saturnino Abril2018-04-231-28/+0
* | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-205-29/+149
|/
* 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-28 00:29:51 +0000