summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-168-63/+280
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-155-27/+305
| |\ \ \ \ \ \ \ \
| * | | | | | | | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-142-2/+16
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-116-71/+63
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-098-41/+124
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-241-28/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-205-29/+149
* | | | | | | | | | | | | | | | | | Push notification styling improvements (#8818)Elias Nahum2018-05-302-135/+293
* | | | | | | | | | | | | | | | | | Avoid emails if user status is OOO or post is an auto response (#8842)Chris Duarte2018-05-281-1/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | [MM-10519] Send websocket event whenever the channel has changed it's type (p...Saturnino Abril2018-05-281-0/+6
* | | | | | | | | | | | | | | | | [MM-1915] Add Deactivate Account - server side (#8699)Carlos Tadeu Panato Junior2018-05-281-0/+22
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-252-24/+2
* | | | | | | | | | | | | | | | add ExperimentalHideTownSquareinLHS in config setting (#8751)Saturnino Abril2018-05-241-26/+27
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-235-38/+305
* | | | | | | | | | | | | | | remove license check when enforcing password requirements (#8840)Saturnino Abril2018-05-231-4/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | add EnablePreviewModeBanner in config (#8834)Saturnino Abril2018-05-221-0/+1
* | | | | | | | | | | | | | MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-221-0/+4
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Skip cluster send when getting non-cached statuses (#8824)Joram Wilander2018-05-181-2/+2
* | | | | | | | | | | | | Fixing TE login. (#8826)Christopher Speller2018-05-181-3/+5
* | | | | | | | | | | | | MM-10640 Set EnableUserCreation to true by default (#8815)Balasankar C2018-05-184-6/+6
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | MM-8708 Remove api package (#8784)Joram Wilander2018-05-169-58/+99
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-152-50/+141
* | | | | | | | | | | MM-10249 Adding plugin ability to intercept posts before they reach the DB. (...Christopher Speller2018-05-152-0/+32
* | | | | | | | | | | Merge remote-tracking branch 'origin/release-4.10' into merge410rc5Derrick Anderson2018-05-156-13/+107
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | add notification when @user, @here, @all and @channel has colon ":" at the en...Saturnino Abril2018-05-112-6/+59
| * | | | | | | | | | More potential panic fixes (#8776)Joram Wilander2018-05-111-6/+9
| * | | | | | | | | | [MM-10458] Change system response to "Could not find the channel" - bug fix (...Carlos Tadeu Panato Junior2018-05-113-1/+39
* | | | | | | | | | | MM-10201: querystring for get slash commands (#8779)Jesse Hallam2018-05-141-3/+5
* | | | | | | | | | | Merge release-4.10 with masterDerrick Anderson2018-05-114-24/+300
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Attempt to fix hub nil panic (#8766)Joram Wilander2018-05-101-1/+1
| * | | | | | | | | Prevent divide by zero if there are no hubs (#8763)Joram Wilander2018-05-101-2/+12
| * | | | | | | | | MM-10495 Updated user agent detection to match output of previous library (#8...Harrison Healey2018-05-093-21/+287
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | 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
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fixes incorrect MiB size. (#8750)Martin Kraft2018-05-091-1/+1
|/ / / / / / /
* | | | | | | 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
| |_|_|_|_|/ |/| | | | |